.github/workflows/osx.yml

@@ -39,8 +39,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.6.1'
+          version: '6.5.1'
-          modules: qtpositioning qtserialport
+          modules: qtpositioning qt5compat qtserialport
       - name: Create localization
         run: lrelease gpxsee.pro
       - name: Configure build

pkg/windows/gpxsee64.nsi

@@ -95,17 +95,10 @@ Var StartMenuFolder
 !insertmacro MUI_LANGUAGE "English"
 
 Function .onInit
-!ifdef QT6
-  ${IfNot} ${AtLeastWin10}
-    MessageBox MB_OK "GPXSee can only be installed on Windows 10 or later."
-    Abort
-  ${EndIf}
-!else
   ${IfNot} ${AtLeastWin7}
     MessageBox MB_OK "GPXSee can only be installed on Windows 7 or later."
     Abort
   ${EndIf}
-!endif
 
   ${If} ${RunningX64}
     SetRegView 64

src/GUI/gui.cpp

@@ -1028,16 +1028,13 @@ void GUI::openDir()
 
 bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
 {
-	QFileInfo fi(fileName);
+	if (_files.contains(fileName))
-	QString canonicalFileName(fi.canonicalFilePath());
-
-	if (_files.contains(canonicalFileName))
 		return true;
 
 	if (!loadFile(fileName, tryUnknown, showError))
 		return false;
 
-	_files.append(canonicalFileName);
+	_files.append(fileName);
 #ifndef Q_OS_ANDROID
 	_browser->setCurrent(fileName);
 #endif // Q_OS_ANDROID
@@ -1050,7 +1047,7 @@ bool GUI::openFile(const QString &fileName, bool tryUnknown, int &showError)
 	updateStatusBarInfo();
 	updateWindowTitle();
 #ifndef Q_OS_ANDROID
-	updateRecentFiles(canonicalFileName);
+	updateRecentFiles(fileName);
 #endif // Q_OS_ANDROID
 
 	return true;
@@ -2029,11 +2026,13 @@ void GUI::updateWindowTitle()
 #ifndef Q_OS_ANDROID
 void GUI::updateRecentFiles(const QString &fileName)
 {
+	QFileInfo fi(fileName);
+	QString canonicalFileName(fi.canonicalFilePath());
 	QAction *a = 0;
 
 	QList<QAction *> actions(_recentFilesActionGroup->actions());
 	for (int i = 0; i < actions.size(); i++) {
-		if (actions.at(i)->text() == fileName) {
+		if (actions.at(i)->text() == canonicalFileName) {
 			a = actions.at(i);
 			break;
 		}
@@ -2047,7 +2046,7 @@ void GUI::updateRecentFiles(const QString &fileName)
 	actions = _recentFilesActionGroup->actions();
 	QAction *before = actions.size() ? actions.last() : _recentFilesEnd;
 	_recentFilesMenu->insertAction(before,
-	  new QAction(fileName, _recentFilesActionGroup));
+	  new QAction(canonicalFileName, _recentFilesActionGroup));
 	_recentFilesMenu->setEnabled(true);
 }