Added missing artifact name

+ use macdeployqt to create the DMG

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 9.10.{build}
+version: 9.11.{build}
 
 configuration:
   - Release
@@ -8,31 +8,16 @@ image:
 
 environment:
   NSISDIR: C:\Program Files (x86)\NSIS
+  OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
   matrix:
-  - QTDIR: C:\Qt\5.15\msvc2019
-    NSI: gpxsee.nsi
-    VCVARS: vcvars32.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win32\bin
-    LIBCRYPTO: libssl-1_1.dll
-    LIBSSL: libcrypto-1_1.dll
   - QTDIR: C:\Qt\5.15\msvc2019_64
-    NSI: gpxsee64.nsi
+  - QTDIR: C:\Qt\6.2\msvc2019_64
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
-  - QTDIR: C:\Qt\6.0\msvc2019_64
-    NSI: gpxsee64.nsi
-    VCVARS: vcvars64.bat
-    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
-    LIBCRYPTO: libssl-1_1-x64.dll
-    LIBSSL: libcrypto-1_1-x64.dll
     NSISDEF: /DQT6
 
 install:
 - cmd: |-
     set PATH=%QTDIR%\bin;%NSISDIR%;%PATH%
-    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\"%VCVARS%
+    call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat
 
 build_script:
 - cmd: |-
@@ -43,17 +28,16 @@ build_script:
     md installer
     copy release\GPXSee.exe installer
     windeployqt --release installer\GPXSee.exe
-    copy pkg\%NSI% installer
+    copy pkg\gpxsee64.nsi installer
-    copy pkg\macros.nsh installer
     xcopy pkg\csv installer\csv /i
     xcopy pkg\maps installer\maps /i
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i
     copy licence.txt installer
-    copy %OPENSSLDIR%\%LIBCRYPTO% installer
+    copy %OPENSSLDIR%\libcrypto-1_1-x64.dll installer
-    copy %OPENSSLDIR%\%LIBSSL% installer
+    copy %OPENSSLDIR%\libssl-1_1-x64.dll installer
 
-    makensis.exe %NSISDEF% installer\%NSI%
+    makensis.exe %NSISDEF% installer\gpxsee64.nsi
 
 artifacts:
 - path: installer\GPXSee-*.exe

.github/workflows/osx.yml

@@ -0,0 +1,31 @@
+name: OS X
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: GPXSee
+    runs-on: macos-10.15
+    steps:
+      - name: Set environment variables
+        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install qt5
+      - name: Create localization
+        run: lrelease gpxsee.pro
+      - name: Configure build
+        run: qmake gpxsee.pro
+      - name: Build project
+        run: make -j3
+      - name: Create DMG
+        run: macdeployqt GPXSee.app -dmg
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: GPXSee.dmg
+          path: GPXSee.dmg

.travis.yml

@@ -1,32 +0,0 @@
-language: c++
-
-os:
-  - linux
-  - osx
-
-dist: focal
-osx_image: xcode12.5
-
-cache:
-  directories:
-    - $HOME/Library/Caches/Homebrew
-
-before_cache:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi
-
-addons:
-  homebrew:
-    packages:
-    - qt
-  apt:
-    packages:
-    - qtbase5-dev
-    - qtbase5-private-dev
-    - libqt5opengl5-dev
-    - qttools5-dev-tools
-
-script:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/qt/bin/:${PATH}; fi
-  - lrelease gpxsee.pro
-  - qmake gpxsee.pro
-  - make

README.md

@@ -18,7 +18,7 @@ GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common G
 
 ## Build
 Build requirements:
-* Qt5 >= 5.11 or Qt 6.x
+* Qt5 >= 5.11 or Qt 6.x*
 * C++11 or newer compiler (tested: msvc2017, gcc 7.5.0, clang/Apple LLVM version 10.0.0)
 
 Build steps:
@@ -28,6 +28,9 @@ qmake gpxsee.pro
 make # nmake on windows
 ```
 
+_* Qt6 builds do not support other encodings than UTF-X and iso8859-1 in XML files as support
+for such files was dropped in Qt6._
+
 ## Download
 * [Windows & OS X builds](http://sourceforge.net/projects/gpxsee)
 * [Linux packages](http://software.opensuse.org/download.html?project=home%3Atumic%3AGPXSee&package=gpxsee)

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 9.10
+VERSION = 9.11
 
 QT += core \
     gui \
@@ -13,7 +13,10 @@ QT += core \
     concurrent \
     widgets \
     printsupport
-greaterThan(QT_MAJOR_VERSION, 5) {QT += openglwidgets}
+greaterThan(QT_MAJOR_VERSION, 5) {
+    QT += openglwidgets \
+          core5compat
+}
 
 CONFIG += object_parallel_to_source
 INCLUDEPATH += ./src

pkg/gpxsee.nsi

@@ -1,400 +0,0 @@
-!include "MUI2.nsh"
-!include "x64.nsh"
-!include "WinVer.nsh"
-!include "macros.nsh"
-
-
-Unicode true
-
-; The name of the installer
-Name "GPXSee"
-; Program version
-!define VERSION "9.10"
-
-; The file to write
-OutFile "GPXSee-${VERSION}.exe"
-; Compression method
-SetCompressor /SOLID lzma
-
-; Required execution level
-RequestExecutionLevel admin
-
-; Don't let the OS scale(blur) the installer GUI
-ManifestDPIAware true
-
-; The default installation directory
-InstallDir "$PROGRAMFILES\GPXSee"
-
-; Installer executable info
-VIProductVersion "${VERSION}.0.0"
-VIAddVersionKey "ProductVersion" ${VERSION}
-VIAddVersionKey "FileVersion" "${VERSION}.0.0"
-VIAddVersionKey "ProductName" "GPXSee"
-VIAddVersionKey "LegalCopyright" "GPXSee project"
-VIAddVersionKey "FileDescription" "GPXSee installer"
-
-; Registry key to check for directory (so if you install again, it will
-; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\GPXSee" "Install_Dir"
-
-; Registry key for uninstaller
-!define REGENTRY "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPXSee"
-
-; Start menu page configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GPXSee"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "GPXSee"
-
-Var StartMenuFolder
-
-;--------------------------------
-
-; Pages
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "licence.txt"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-
-; Languages
-!insertmacro MUI_LANGUAGE "English"
-
-Function .onInit
-  ${IfNot} ${AtLeastWin7}
-    MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
-    Abort
-  ${EndIf}
-FunctionEnd 
-
-; The stuff to install
-Section "GPXSee" SEC_APP
-
-  SectionIn RO
-
-  ; Set output path to the installation directory
-  SetOutPath $INSTDIR
-
-  ; Put the files there
-  File "gpxsee.exe"
-  File /r "maps"
-  File /r "csv"
-  File /r "symbols"
-
-  ; Create the uninstaller
-  WriteUninstaller "$INSTDIR\uninstall.exe"  
-  
-  ; Create start menu entry and add links
-  SetShellVarContext all
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GPXSee.lnk" "$INSTDIR\gpxsee.exe"
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-  ; Write the installation path into the registry
-  DetailPrint "Registering application..."
-  WriteRegStr HKLM SOFTWARE\GPXSee "Install_Dir" "$INSTDIR"
-
-  ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "${REGENTRY}" "DisplayName" "GPXSee"
-  WriteRegStr HKLM "${REGENTRY}" "Publisher" "Martin Tůma"
-  WriteRegStr HKLM "${REGENTRY}" "DisplayVersion" "${VERSION}"
-  WriteRegStr HKLM "${REGENTRY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteRegStr HKLM "${REGENTRY}" "DisplayIcon" '"$INSTDIR\gpxsee.exe"'
-  WriteRegStr HKLM "${REGENTRY}" "InstallLocation" '"$INSTDIR"'
-  WriteRegStr HKLM "${REGENTRY}" "URLInfoAbout" "https://www.gpxsee.org"
-  WriteRegDWORD HKLM "${REGENTRY}" "NoModify" 1
-  WriteRegDWORD HKLM "${REGENTRY}" "NoRepair" 1
-
-  ; Associate file formats
-  DetailPrint "Associating file types..."
-  !insertmacro FILE_ASSOCIATION_ADD "wpt" "OziExplorer Waypoint File" 1
-  !insertmacro FILE_ASSOCIATION_ADD "loc" "Geocaching.com Waypoint File" 2
-  !insertmacro FILE_ASSOCIATION_ADD "slf" "Sigma Log File" 3
-  !insertmacro FILE_ASSOCIATION_ADD "geojson" "GeoJSON" 4
-  !insertmacro FILE_ASSOCIATION_ADD "cup" "SeeYou CUP File" 5
-  !insertmacro FILE_ASSOCIATION_ADD "gpi" "Garmin POI File" 6
-  !insertmacro FILE_ASSOCIATION_ADD "sml" "Suunto Markup Language" 7
-  !insertmacro FILE_ASSOCIATION_ADD "img" "Garmin IMG Map" 8
-  !insertmacro FILE_ASSOCIATION_ADD "jnx" "Garmin JNX Map" 9
-  !insertmacro FILE_ASSOCIATION_ADD "kap" "BSB Nautical Chart" 10
-  !insertmacro FILE_ASSOCIATION_ADD "gpx" "GPS Exchange Format" 11
-  !insertmacro FILE_ASSOCIATION_ADD "map" "OziExplorer Map File" 12
-  !insertmacro FILE_ASSOCIATION_ADD "mbtiles" "MBTiles Map File" 13
-  !insertmacro FILE_ASSOCIATION_ADD "rmap" "TwoNav Raster Map File" 14
-  !insertmacro FILE_ASSOCIATION_ADD "tba" "TrekBuddy Atlas" 15
-  !insertmacro FILE_ASSOCIATION_ADD "aqm" "AlpineQuest Map File" 16
-  !insertmacro FILE_ASSOCIATION_ADD "sqlitedb" "RMaps SQLite Map File" 17
-  !insertmacro FILE_ASSOCIATION_ADD "ov2" "TomTom POI File" 18
-  !insertmacro FILE_ASSOCIATION_ADD "itn" "TomTom Route File" 19
-  !insertmacro FILE_ASSOCIATION_ADD "wld" "ESRI World File" 20
-  !insertmacro FILE_ASSOCIATION_ADD "jgw" "ESRI World File" 20
-  !insertmacro FILE_ASSOCIATION_ADD "gfw" "ESRI World File" 20
-  !insertmacro FILE_ASSOCIATION_ADD "pgw" "ESRI World File" 20
-  !insertmacro FILE_ASSOCIATION_ADD "tfw" "ESRI World File" 20
-  !insertmacro FILE_ASSOCIATION_ADD "omd" "ONmove Log File" 21
-  !insertmacro FILE_ASSOCIATION_ADD "tcx" "Training Center XML" 22
-  !insertmacro FILE_ASSOCIATION_ADD "ghp" "ONmove Log File" 23
-  !insertmacro FILE_ASSOCIATION_ADD "kml" "Keyhole Markup Language" 24
-  !insertmacro FILE_ASSOCIATION_ADD "kmz" "KML geographic compressed data" 24
-  !insertmacro FILE_ASSOCIATION_ADD "fit" "Flexible and Interoperable Data Transfer" 25
-  !insertmacro FILE_ASSOCIATION_ADD "igc" "Flight Recorder Data Format" 26
-  !insertmacro FILE_ASSOCIATION_ADD "nmea" "NMEA 0183 Data" 27
-  !insertmacro FILE_ASSOCIATION_ADD "plt" "OziExplorer Track File" 28
-  !insertmacro FILE_ASSOCIATION_ADD "rte" "OziExplorer Route File" 29  
-
-  WriteRegStr HKCR "Applications\GPXSee.exe\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-  WriteRegStr HKCR ".gpx\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tcx\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".kml\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".fit\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".igc\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".nmea\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".plt\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".rte\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".wpt\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".loc\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".slf\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".geojson\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".cup\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".gpi\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".sml\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".ov2\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".itn\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".csv\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".json\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".jpg\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".jpeg\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".img\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".jnx\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".kap\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".map\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".mbtiles\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".rmap\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".rtmap\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tar\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tba\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tif\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tiff\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".xml\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".kmz\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".aqm\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".sqlitedb\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".wld\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".jgw\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".gfw\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".pgw\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".tfw\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".omd\OpenWithList" "GPXSee.exe" ""
-  WriteRegStr HKCR ".ghp\OpenWithList" "GPXSee.exe" ""
-
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
-
-SectionEnd
-
-Section "QT framework" SEC_QT
-
-  SectionIn RO
-
-  File "Qt5Core.dll"
-  File "Qt5Gui.dll"
-  File "Qt5Widgets.dll"
-  File "Qt5PrintSupport.dll"
-  File "Qt5Network.dll"
-  File "Qt5Sql.dll"
-  File "Qt5Svg.dll"
-  File "Qt5Concurrent.dll"
-  File /r "platforms"
-  File /r "imageformats"
-  File /r "printsupport"
-  File /r "styles"
-  File /r "sqldrivers"
-
-SectionEnd
-
-Section "MSVC runtime" SEC_MSVC
-
-  SectionIn RO
-
-  SetOutPath $TEMP
-  File "vc_redist.x86.exe"
-  ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart'
-  SetOutPath $INSTDIR    
-
-SectionEnd
-
-Section "OpenSSL" SEC_OPENSSL
-
-  SectionIn RO
-
-  File "libcrypto-1_1.dll"
-  File "libssl-1_1.dll"
-
-SectionEnd
-
-Section "ANGLE" SEC_ANGLE
-
-  File "libGLESv2.dll"
-  File "libEGL.dll"
-  File "D3DCompiler_47.dll"
-
-SectionEnd
-
-SectionGroup "Localization" SEC_LOCALIZATION
-  !insertmacro LOCALIZATION "Chinese (Simplified)" "zh"
-  !insertmacro LOCALIZATION "Czech" "cs"
-  !insertmacro LOCALIZATION "Danish" "da"
-  !insertmacro LOCALIZATION "Esperanto" "eo"
-  !insertmacro LOCALIZATION "Finnish" "fi"
-  !insertmacro LOCALIZATION "French" "fr"
-  !insertmacro LOCALIZATION "German" "de"
-  !insertmacro LOCALIZATION "Hungarian" "hu"
-  !insertmacro LOCALIZATION "Italian" "it"
-  !insertmacro LOCALIZATION "Norwegian" "nb"
-  !insertmacro LOCALIZATION "Polish" "pl"
-  !insertmacro LOCALIZATION "Portuguese (Brazil)" "pt_BR"
-  !insertmacro LOCALIZATION "Russian" "ru"
-  !insertmacro LOCALIZATION "Spanish" "es"
-  !insertmacro LOCALIZATION "Swedish" "sv"
-  !insertmacro LOCALIZATION "Turkish" "tr"
-  !insertmacro LOCALIZATION "Ukrainian" "uk"
-SectionGroupEnd
-
-;--------------------------------
-
-; Uninstaller
-
-Section "Uninstall"
-
-  ; Remove registry keys
-  DeleteRegKey HKLM "${REGENTRY}"
-  DeleteRegKey HKLM SOFTWARE\GPXSee
-
-  ; Remove directories used
-  RMDir /r "$INSTDIR"
-
-  ; Remove Start menu entries
-  SetShellVarContext all
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-  Delete "$SMPROGRAMS\$StartMenuFolder\*.*"
-  RMDir "$SMPROGRAMS\$StartMenuFolder"
-
-  ; Remove file associations
-  !insertmacro FILE_ASSOCIATION_REMOVE "gpx"
-  !insertmacro FILE_ASSOCIATION_REMOVE "tcx"
-  !insertmacro FILE_ASSOCIATION_REMOVE "kml"
-  !insertmacro FILE_ASSOCIATION_REMOVE "fit"
-  !insertmacro FILE_ASSOCIATION_REMOVE "igc"
-  !insertmacro FILE_ASSOCIATION_REMOVE "nmea"
-  !insertmacro FILE_ASSOCIATION_REMOVE "plt"
-  !insertmacro FILE_ASSOCIATION_REMOVE "rte"
-  !insertmacro FILE_ASSOCIATION_REMOVE "wpt"
-  !insertmacro FILE_ASSOCIATION_REMOVE "loc"
-  !insertmacro FILE_ASSOCIATION_REMOVE "slf"
-  !insertmacro FILE_ASSOCIATION_REMOVE "geojson"
-  !insertmacro FILE_ASSOCIATION_REMOVE "cup"
-  !insertmacro FILE_ASSOCIATION_REMOVE "gpi"
-  !insertmacro FILE_ASSOCIATION_REMOVE "sml"
-  !insertmacro FILE_ASSOCIATION_REMOVE "img"
-  !insertmacro FILE_ASSOCIATION_REMOVE "jnx"
-  !insertmacro FILE_ASSOCIATION_REMOVE "kap"
-  !insertmacro FILE_ASSOCIATION_REMOVE "map"
-  !insertmacro FILE_ASSOCIATION_REMOVE "mbtiles"
-  !insertmacro FILE_ASSOCIATION_REMOVE "rmap"
-  !insertmacro FILE_ASSOCIATION_REMOVE "tba"
-  !insertmacro FILE_ASSOCIATION_REMOVE "kmz"
-  !insertmacro FILE_ASSOCIATION_REMOVE "aqm"
-  !insertmacro FILE_ASSOCIATION_REMOVE "sqlitedb"
-  !insertmacro FILE_ASSOCIATION_REMOVE "ov2"
-  !insertmacro FILE_ASSOCIATION_REMOVE "itn"
-  !insertmacro FILE_ASSOCIATION_REMOVE "wld"
-  !insertmacro FILE_ASSOCIATION_REMOVE "jgw"
-  !insertmacro FILE_ASSOCIATION_REMOVE "gfw"
-  !insertmacro FILE_ASSOCIATION_REMOVE "pgw"
-  !insertmacro FILE_ASSOCIATION_REMOVE "tfw"
-  !insertmacro FILE_ASSOCIATION_REMOVE "omd"
-  !insertmacro FILE_ASSOCIATION_REMOVE "ghp"
-
-  DeleteRegValue HKCR ".gpx\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tcx\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".kml\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".fit\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".igc\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".nmea\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".plt\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".rte\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".wpt\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".loc\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".slf\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".geojson\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".cup\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".gpi\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".sml\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".ov2\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".itn\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".csv\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".json\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".jpg\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".jpeg\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".img\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".jnx\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".kap\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".map\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".mbtiles\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".rmap\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".rtmap\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tar\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tba\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tif\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tiff\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".xml\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".kmz\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".aqm\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".sqlitedb\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".wld\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".jgw\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".gfw\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".pgw\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".tfw\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".omd\OpenWithList" "GPXSee.exe"
-  DeleteRegValue HKCR ".ghp\OpenWithList" "GPXSee.exe"
-  DeleteRegKey HKCR "Applications\GPXSee.exe"
-  
-  System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)'
-
-SectionEnd
-
-;-------------------------------
-
-;Descriptions
-
-;Language strings
-LangString DESC_QT ${LANG_ENGLISH} \
-  "QT cross-platform application framework."
-LangString DESC_MSVC ${LANG_ENGLISH} \
-  "Microsoft Visual C++ 2017 runtime. If already installed, will be skipped."
-LangString DESC_OPENSSL ${LANG_ENGLISH} \
-  "OpenSSL library. Required for HTTPS to work."
-LangString DESC_ANGLE ${LANG_ENGLISH} \
-  "ANGLE (OpenGL via Direct3D). Enables OpenGL on systems without native OpenGL drivers."
-LangString DESC_APP ${LANG_ENGLISH} \
-  "GPXSee application"
-LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
-  "Localization"
-
-;Assign language strings to sections
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_QT} $(DESC_QT)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_OPENSSL} $(DESC_OPENSSL)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_ANGLE} $(DESC_ANGLE)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC) 
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END

pkg/gpxsee64.nsi

@@ -1,15 +1,43 @@
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "WinVer.nsh"
-!include "macros.nsh"
 
 
+; Macros
+
+; File association
+!macro FILE_ASSOCIATION_ADD EXT DESC ICON
+  WriteRegStr HKCR ".${EXT}" "" "GPXSee.${EXT}"
+  WriteRegStr HKCR "GPXSee.${EXT}" ""  "${DESC}"
+  WriteRegStr HKCR "GPXSee.${EXT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,${ICON}"
+  WriteRegStr HKCR "GPXSee.${EXT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
+!macroend
+
+!macro FILE_ASSOCIATION_REMOVE EXT
+  DeleteRegKey HKCR "GPXSee.${EXT}"
+  DeleteRegKey HKCR ".${EXT}"
+!macroend
+
+; Translations
+!macro LOCALIZATION LANG CODE
+  Section "${LANG}"
+    IfFileExists "$INSTDIR\translations" +2 0
+      CreateDirectory "$INSTDIR\translations" 
+    File /oname=translations\gpxsee_${CODE}.qm translations\gpxsee_${CODE}.qm
+    !if /FileExists translations\qt_${CODE}.qm
+      File /oname=translations\qt_${CODE}.qm translations\qt_${CODE}.qm
+    !endif
+  SectionEnd
+!macroend
+
+;--------------------------------
+
 Unicode true
 
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "9.10"
+!define VERSION "9.11"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
@@ -221,6 +249,7 @@ Section "QT framework" SEC_QT
   File "Qt6Sql.dll"
   File "Qt6Svg.dll"
   File "Qt6Widgets.dll"
+  File "Qt6Core5Compat.dll"
 !else
   File "Qt5Core.dll"
   File "Qt5Gui.dll"

pkg/macros.nsh

@@ -1,24 +0,0 @@
-; File association
-!macro FILE_ASSOCIATION_ADD EXT DESC ICON
-  WriteRegStr HKCR ".${EXT}" "" "GPXSee.${EXT}"
-  WriteRegStr HKCR "GPXSee.${EXT}" ""  "${DESC}"
-  WriteRegStr HKCR "GPXSee.${EXT}\DefaultIcon" "" "$INSTDIR\GPXSee.exe,${ICON}"
-  WriteRegStr HKCR "GPXSee.${EXT}\shell\open\command" "" "$\"$INSTDIR\GPXSee.exe$\" $\"%1$\""
-!macroend
-
-!macro FILE_ASSOCIATION_REMOVE EXT
-  DeleteRegKey HKCR "GPXSee.${EXT}"
-  DeleteRegKey HKCR ".${EXT}"
-!macroend
-
-; Translations
-!macro LOCALIZATION LANG CODE
-  Section "${LANG}"
-    IfFileExists "$INSTDIR\translations" +2 0
-      CreateDirectory "$INSTDIR\translations" 
-    File /oname=translations\gpxsee_${CODE}.qm translations\gpxsee_${CODE}.qm
-    !if /FileExists translations\qt_${CODE}.qm
-      File /oname=translations\qt_${CODE}.qm translations\qt_${CODE}.qm
-    !endif
-  SectionEnd
-!macroend

src/common/textcodec.cpp

@@ -1,8 +1,5 @@
-#include "textcodec.h"
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-
 #include <QTextCodec>
+#include "textcodec.h"
 
 TextCodec::TextCodec()
 {
@@ -60,217 +57,3 @@ QString TextCodec::toString(const QByteArray &ba) const
 {
 	return _codec ? _codec->toUnicode(ba) : QString::fromUtf8(ba);
 }
-
-#else // QT6
-
-#include <QVector>
-
-static const char32_t cp1250[] = {
-	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
-	0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
-	0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
-	0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-	0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-	0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-	0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-	0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-	0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-	0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-	0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
-};
-
-static const char32_t cp1251[] = {
-	0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
-	0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x0000, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
-	0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
-	0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
-	0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
-	0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
-	0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-	0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-	0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-	0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-	0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-	0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-	0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
-};
-
-static const char32_t cp1252[] = {
-	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-	0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
-};
-
-static const char32_t cp1253[] = {
-	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
-	0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
-	0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-	0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-	0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
-	0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
-	0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
-	0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-	0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
-	0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
-};
-
-static const char32_t cp1254[] = {
-	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-	0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-	0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-	0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-	0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
-	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-	0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-	0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
-};
-
-static const char32_t cp1255[] = {
-	0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-	0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
-	0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
-	0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
-	0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-	0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-	0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
-};
-
-static const char32_t cp1256[] = {
-	0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
-	0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
-	0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-	0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
-	0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-	0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-	0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
-	0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
-	0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
-	0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
-	0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
-	0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2,
-};
-
-static const char32_t cp1257[] = {
-	0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
-	0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
-	0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-	0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
-	0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
-	0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
-	0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-	0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
-	0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-	0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
-	0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
-	0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
-	0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
-	0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
-	0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
-	0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9,
-};
-
-TextCodec::TextCodec() : _table(cp1252)
-{
-
-}
-
-TextCodec::TextCodec(int codepage)
-{
-	switch (codepage) {
-		case 65001:
-			_table = 0;
-			break;
-		case 1250:
-			_table = cp1250;
-			break;
-		case 1251:
-			_table = cp1251;
-			break;
-		case 1253:
-			_table = cp1253;
-			break;
-		case 1254:
-			_table = cp1254;
-			break;
-		case 1255:
-			_table = cp1255;
-			break;
-		case 1256:
-			_table = cp1256;
-			break;
-		case 1257:
-			_table = cp1257;
-			break;
-		default:
-			_table = cp1252;
-	}
-}
-
-QString TextCodec::toString(const QByteArray &ba) const
-{
-	return _table ? from8bCp(ba) : QString::fromUtf8(ba);
-}
-
-QString TextCodec::from8bCp(const QByteArray &ba) const
-{
-	QVector<char32_t> ucs4(ba.size());
-
-	for (int i = 0; i < ba.size(); i++) {
-		quint8 c = (quint8)ba.at(i);
-		if (c < 0x80)
-			ucs4[i] = (char32_t)c;
-		else
-			ucs4[i] = _table[c - 0x80];
-	}
-
-	return QString::fromUcs4(ucs4.constData(), ucs4.size());
-}
-#endif // QT6

src/common/textcodec.h

@@ -14,12 +14,7 @@ public:
 	QString toString(const QByteArray &ba) const;
 
 private:
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	QTextCodec *_codec;
-#else // QT6
-	QString from8bCp(const QByteArray &ba) const;
-	const char32_t *_table;
-#endif // QT6
 };
 
 #endif // TEXTCODEC_H

src/map/IMG/lblfile.cpp

@@ -214,7 +214,7 @@ Label LBLFile::str2label(const QVector<quint8> &str, bool capitalize,
 	for (int i = 0; i < str.size(); i++) {
 		const quint8 &c = str.at(i);
 
-		if (c == 0 || c == 0x1d)
+		if (c == 0 || c == 0x1d || c == 0x07)
 			break;
 
 		if (c == 0x1c)