Update Qt to 6.7.2

jdpurcell · Jul 5, 2024 · 4c13ccd · 4c13ccd
1 parent 01544b5
commit 4c13ccd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,25 +23,25 @@ jobs:
             qtVersion: '5.15.2'
             buildArch: 'X64'
           - runner: 'macos-14'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.2'
             qtModules: 'qtimageformats'
             buildArch: 'X64'
           - runner: 'macos-14'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.2'
             qtModules: 'qtimageformats'
             buildArch: 'Arm64'
           - runner: 'macos-14'
             qtVersion: '5.15.2'
             osSuffix: '_legacy'
             buildArch: 'X64'
           - runner: 'windows-2022'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.2'
             qtArch: 'win64_msvc2019_64'
             osSuffix: '_64'
             qtModules: 'qtimageformats'
             buildArch: 'X64'
           - runner: 'windows-2022'
-            qtVersion: '6.5.3'
+            qtVersion: '6.7.2'
             qtArch: 'win64_msvc2019_arm64'
             osSuffix: '_arm64'
             qtModules: 'qtimageformats'

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,8 +16,12 @@ int main(int argc, char *argv[])
 
     SettingsManager::migrateOldSettings();
 
+#ifdef Q_OS_WIN
     if (QSettings().value("options/nonnativetheme").toBool())
         QApplication::setStyle("fusion");
+    else
+        QApplication::setStyle("windowsvista"); // Avoid windows11 style until it's less buggy
+#endif
 
     QVApplication app(argc, argv);