summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2023-01-26 00:45:22 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2023-01-26 00:45:22 +0100
commitb6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e (patch)
tree6054de33618d02d06f1af82c49e70ed37411264a
parentMerge pull request #9675 from Morph1984/ini-concat (diff)
downloadyuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar.gz
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar.bz2
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar.lz
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar.xz
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.tar.zst
yuzu-b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e.zip
-rw-r--r--src/yuzu/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 3fba802af..62aaf41bf 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -4455,8 +4455,10 @@ int main(int argc, char* argv[]) {
}
#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);
+#endif
// Enables the core to make the qt created contexts current on std::threads
QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);