diff options
| author | 2023-01-25 20:46:51 -0500 | |
|---|---|---|
| committer | 2023-01-25 20:46:51 -0500 | |
| commit | 0a7cdc198103c5c8a938a72930455b4b930ff324 (patch) | |
| tree | 6054de33618d02d06f1af82c49e70ed37411264a | |
| parent | Merge pull request #9675 from Morph1984/ini-concat (diff) | |
| parent | main: Only set AA_DisableWindowContextHelpButton below Qt6 (diff) | |
| download | yuzu-0a7cdc198103c5c8a938a72930455b4b930ff324.tar.gz yuzu-0a7cdc198103c5c8a938a72930455b4b930ff324.tar.xz yuzu-0a7cdc198103c5c8a938a72930455b4b930ff324.zip | |
Merge pull request #9681 from Morph1984/nice-one-qt6
main: Only set AA_DisableWindowContextHelpButton below Qt6
| -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[]) { | |||
| 4455 | } | 4455 | } |
| 4456 | #endif | 4456 | #endif |
| 4457 | 4457 | ||
| 4458 | // Disables the "?" button on all dialogs. | 4458 | #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) |
| 4459 | // Disables the "?" button on all dialogs. Disabled by default on Qt6. | ||
| 4459 | QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); | 4460 | QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); |
| 4461 | #endif | ||
| 4460 | 4462 | ||
| 4461 | // Enables the core to make the qt created contexts current on std::threads | 4463 | // Enables the core to make the qt created contexts current on std::threads |
| 4462 | QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); | 4464 | QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); |