Преглед изворни кода

Merge pull request #9681 from Morph1984/nice-one-qt6

main: Only set AA_DisableWindowContextHelpButton below Qt6
Morph пре 3 година
родитељ
комит
0a7cdc1981
1 измењених фајлова са 3 додато и 1 уклоњено
  1. 3 1
      src/yuzu/main.cpp

+ 3 - 1
src/yuzu/main.cpp

@@ -4455,8 +4455,10 @@ int main(int argc, char* argv[]) {
     }
     }
 #endif
 #endif
 
 
-    // Disables the "?" button on all dialogs.
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // Disables the "?" button on all dialogs. Disabled by default on Qt6.
     QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
     QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
+#endif
 
 
     // Enables the core to make the qt created contexts current on std::threads
     // Enables the core to make the qt created contexts current on std::threads
     QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
     QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);