diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-01-25 20:46:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 20:46:51 -0500 |
| commit | 0a7cdc198103c5c8a938a72930455b4b930ff324 (patch) | |
| tree | 6054de33618d02d06f1af82c49e70ed37411264a /src/yuzu/main.cpp | |
| parent | 0d1a9a12c9e797a0921b2d3bfc9a0adb6df67e85 (diff) | |
| parent | b6e5a6bda8a71b4cc53aa0b6d4a45910ac04ac9e (diff) | |
Merge pull request #9681 from Morph1984/nice-one-qt6
main: Only set AA_DisableWindowContextHelpButton below Qt6
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 4 |
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); |