.github/workflows/windows.yml

@@ -1,17 +1,15 @@
 name: Windows CI
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request]
 
 jobs:
   msvc-qmake-build:
   
     strategy:
       matrix:
-        include:
-          - qt_ver: '6.8.0'
-            vs: '2022'
-            aqt_arch: 'win64_msvc2022_64'
-            msvc_arch: 'x64'
+        vs: ['2022']
+        msvc_arch: ['x64']
+        qt_ver: ['6.7.2']
 
     runs-on: windows-2022
 
@@ -20,7 +18,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        arch: ${{ matrix.aqt_arch }}
+        arch: 'win64_msvc2019_64'
         version: ${{ matrix.qt_ver }}
         modules: 'qtimageformats'
     - name: Build
@@ -43,11 +41,9 @@ jobs:
   
     strategy:
       matrix:
-        include:
-          - qt_ver: '6.8.0'
-            vs: '2022'
-            aqt_arch: 'win64_msvc2022_64'
-            msvc_arch: 'x64'
+        vs: ['2022']
+        msvc_arch: ['x64']
+        qt_ver: ['6.7.2']
 
     runs-on: windows-2022
 
@@ -56,7 +52,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        arch: ${{ matrix.aqt_arch }}
+        arch: 'win64_msvc2019_64'
         version: ${{ matrix.qt_ver }}
         modules: 'qtimageformats'
     - name: Build
@@ -107,7 +103,7 @@ jobs:
         windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe
         robocopy ./dependencies_bin/bin build/bin *.dll
         if ErrorLevel 8 (exit /B 1)
-        copy LICENSE build\bin
+        copy LICENSE build/bin/
         exit /B 0
     - uses: actions/upload-artifact@v4
       with:

app/settings.cpp

@@ -6,7 +6,6 @@
 
 #include <QApplication>
 #include <QStandardPaths>
-#include <QStringBuilder>
 #include <QDebug>
 #include <QDir>
 #include <QMetaEnum>
@@ -150,11 +149,8 @@ Settings::Settings()
 #endif // defined(FLAG_PORTABLE_MODE_SUPPORT) && defined(Q_OS_WIN)
 
     if (configPath.isEmpty()) {
-        // Should be %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
-        // Sadly <APPNAME> is unknown when Settings object is created (it's before the creation
-        // of QApplication), so we'll need to append the app name manually.
-        configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) %
-                     QDir::separator() % QLatin1String("Pineapple Pictures");
+        // %LOCALAPPDATA%\<APPNAME> under Windows, ~/.config/<APPNAME> under Linux.
+        configPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
     }
 
     m_qsettings = new QSettings(QDir(configPath).absoluteFilePath("config.ini"), QSettings::IniFormat, this);