From b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 25 Jan 2023 18:45:22 -0500 Subject: [PATCH] main: Only set AA_DisableWindowContextHelpButton below Qt6 This is fortunately disabled by default on Qt6, so we just have to check whether we are compiling with Qt6 or not. --- src/yuzu/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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);