.appveyor.yml

@@ -1,4 +1,4 @@
-version: 12.0.{build}
+version: 11.12.{build}
 
 configuration:
   - Release

.github/workflows/android.yml

@@ -37,7 +37,7 @@ jobs:
           version: '6.4.0'
           target: 'android'
           arch: 'android_armv7'
-          modules: qtpositioning qt5compat qtserialport
+          modules: qtpositioning qt5compat
       - name: Install Android OpenSSL
         run:  git clone https://github.com/KDAB/android_openssl.git
       - name: Create localization

.github/workflows/linux.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev
+          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
     TARGET = GPXSee
 }
-VERSION = 12.0
+VERSION = 11.12
 
 QT += core \
     gui \
@@ -14,8 +14,7 @@ QT += core \
     widgets \
     printsupport \
     positioning \
-    svg \
+    svg
-    serialport
 greaterThan(QT_MAJOR_VERSION, 5) {
     QT += openglwidgets \
           core5compat
@@ -264,7 +263,6 @@ SOURCES += src/main.cpp \
     src/GUI/motioninfoitem.cpp \
     src/GUI/navigationwidget.cpp \
     src/GUI/pluginparameters.cpp \
-    src/GUI/settings.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \

pkg/windows/gpxsee64.nsi

@@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "12.0"
+!define VERSION "11.12"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/GUI/gui.cpp

@@ -2641,8 +2641,8 @@ void GUI::writeSettings()
 		settings.setValue(DEM_USERNAME_SETTING, _options.demUsername);
 	if (_options.demPassword != DEM_PASSWORD_DEFAULT)
 		settings.setValue(DEM_PASSWORD_SETTING, _options.demPassword);
-	if (_options.plugin != POSITION_PLUGIN_DEFAULT)
+	// the plugins order is random so always store the value
-		settings.setValue(POSITION_PLUGIN_SETTING, _options.plugin);
+	settings.setValue(POSITION_PLUGIN_SETTING, _options.plugin);
 	index = 0;
 	for (QMap<QString, QVariantMap>::const_iterator it
 	  = _options.pluginParams.constBegin();

src/GUI/markerinfoitem.h

@@ -2,7 +2,6 @@
 #define MARKERINFOITEM_H
 
 #include <QGraphicsItem>
-#include <QFont>
 #include "format.h"
 
 class Coordinates;

src/GUI/settings.cpp

@@ -1,21 +0,0 @@
-#include <QGeoPositionInfoSource>
-#include "settings.h"
-
-static QString defaultPlugin()
-{
-	QString source;
-
-	QGeoPositionInfoSource *ps = QGeoPositionInfoSource::createDefaultSource(0);
-	if (ps) {
-		source = ps->sourceName();
-		delete ps;
-	}
-
-	return source;
-}
-
-const QString &Settings::positionPlugin()
-{
-	static QString plugin(defaultPlugin());
-	return plugin;
-}

src/GUI/settings.h

@@ -1,21 +1,14 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <QLocale>
+#include <QtGlobal>
-#include <QDir>
-#include <QPageLayout>
-#include <QPageSize>
 #include "common/config.h"
-#include "common/util.h"
-#include "data/graph.h"
-#include "format.h"
-#include "units.h"
-#include "timetype.h"
-#include "markerinfoitem.h"
-
 
 #define IMPERIAL_UNITS() \
 	(QLocale::system().measurementSystem() == QLocale::ImperialSystem)
+#define POSITION_PLUGIN() \
+	(QGeoPositionInfoSource::availableSources().isEmpty() \
+	  ? "" : QGeoPositionInfoSource::availableSources().first())
 #define CURRENT_PATH(filename) \
 	QDir::current().filePath(filename)
 
@@ -221,7 +214,7 @@
 #define DEM_PASSWORD_SETTING              "demPassword"
 #define DEM_PASSWORD_DEFAULT              ""
 #define POSITION_PLUGIN_SETTING           "positionPlugin"
-#define POSITION_PLUGIN_DEFAULT           Settings::positionPlugin()
+#define POSITION_PLUGIN_DEFAULT           POSITION_PLUGIN()
 #define POSITION_PLUGIN_PARAMS_PREFIX     "pluginParameters"
 #define POSITION_PLUGIN_PARAMS_PLUGIN     "plugin"
 #define POSITION_PLUGIN_PARAMS_PARAM      "parameters"
@@ -262,15 +255,10 @@
 #define HIDPI_MAP_SETTING                 "HiDPIMap"
 #define HIDPI_MAP_DEFAULT                 true
 #define DATA_PATH_SETTING                 "dataPath"
-#define DATA_PATH_DEFAULT                 ""
+#define DATA_PATH_DEFAULT                 QString()
 #define MAPS_PATH_SETTING                 "mapsPath"
-#define MAPS_PATH_DEFAULT                 ""
+#define MAPS_PATH_DEFAULT                 QString()
 #define POI_PATH_SETTING                  "poiPath"
-#define POI_PATH_DEFAULT                  ""
+#define POI_PATH_DEFAULT                  QString()
-
-namespace Settings
-{
-    const QString &positionPlugin();
-}
 
 #endif // SETTINGS_H

src/data/graph.h

@@ -3,7 +3,6 @@
 
 #include <QList>
 #include <QVector>
-#include <QColor>
 #include <QDebug>
 #include <cmath>