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

main: Only set AA_DisableWindowContextHelpButton below Qt6
This commit is contained in:
Morph 2023-01-25 20:46:51 -05:00 committed by GitHub
commit 0a7cdc1981
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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);