.github/workflows/android.yml

@@ -15,14 +15,14 @@ jobs:
       - name: set up JDK 11
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: '11'
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-        with:
-          cmdline-tools-version: 9862592
-      - name: Install android platform, build-tools and ndk
-        run:  ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
+        uses: android-actions/setup-android@v2
+      - name: Run sdkmanager update
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --update
+      - name: Install android platform, platform-tools, build-tools and ndk
+        run:  ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620"
       - name: Setup NDK path
         run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
       - name: Install Qt (Desktop)

gpxsee.pro

@@ -19,9 +19,9 @@ QT += core \
     serialport
 greaterThan(QT_MAJOR_VERSION, 5) {
     QT += openglwidgets
-    lessThan(QT_MINOR_VERSION, 5) {
-        QT += core5compat
-    }
+	lessThan(QT_MINOR_VERSION, 5) {
+	    QT += core5compat
+	}
 }
 
 CONFIG += object_parallel_to_source

pkg/windows/gpxsee64.nsi

@@ -264,6 +264,7 @@ Section "QT framework" SEC_QT
   File "Qt6Sql.dll"
   File "Qt6Svg.dll"
   File "Qt6Widgets.dll"
+  File "Qt6Core5Compat.dll"
   File "Qt6Positioning.dll"
   File "Qt6SerialPort.dll"
   File /r "tls"

src/common/textcodec.h

@@ -2,6 +2,7 @@
 #define TEXTCODEC_H
 
 #include <QString>
+#include <QMap>
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 #include <QTextCodec>
 #else // QT 6.5