GPXSee: bump to 7.1 (#3550) (#3550)

This commit is contained in:
Nikolay Korotkiy
2019-01-10 07:41:05 +03:00
committed by Sergei Reznikov
parent 71e3841ea0
commit d30b4c752a
4 changed files with 61 additions and 51 deletions

View File

@@ -1,23 +0,0 @@
From a507a1a8c50b7e8704505d44d12ab04ddffbbd48 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 10 Oct 2018 13:07:48 +0300
Subject: Fix GLOBAL_DIR/USER_DIR
diff --git a/src/config.h b/src/config.h
index 3f078f4..1393401 100644
--- a/src/config.h
+++ b/src/config.h
@@ -26,6 +26,9 @@
#define USER_DIR QDir::homePath() + QString("/.gpxsee")
#define GLOBAL_DIR QApplication::applicationDirPath() \
+ QString("/../Resources")
+#elif defined(Q_OS_HAIKU)
+#define USER_DIR QDir::homePath() + QString("/config/settings/GPXSee")
+#define GLOBAL_DIR QApplication::applicationDirPath()
#else
#define USER_DIR QDir::homePath() + QString("/.gpxsee")
#define GLOBAL_DIR QString("/usr/share/gpxsee")
--
2.19.0

View File

@@ -0,0 +1,22 @@
From b2dbcadd0651669834685679a20ccad452e4f6e2 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 7 Jan 2019 22:29:26 +0300
Subject: Fix APP_NAME
diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp
index d9573da..f4c29ff 100644
--- a/src/GUI/app.cpp
+++ b/src/GUI/app.cpp
@@ -21,7 +21,7 @@
App::App(int &argc, char **argv) : QApplication(argc, argv),
_argc(argc), _argv(argv)
{
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) || defined(Q_OS_HAIKU)
setApplicationName(APP_NAME);
#else
setApplicationName(QString(APP_NAME).toLower());
--
2.19.1