From 6700d617b8b4efaa74145b0e8169b071b6f2e080 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 9 Feb 2022 17:19:43 -0800 Subject: [PATCH] Qt6: the help button is now opt in instead of opt out This seems much more reasonable. Signed-off-by: Dirk Hohndel --- core/qt-init.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/qt-init.cpp b/core/qt-init.cpp index faec198f9..fb816ae07 100644 --- a/core/qt-init.cpp +++ b/core/qt-init.cpp @@ -1,3 +1,4 @@ + // SPDX-License-Identifier: GPL-2.0 #include #include @@ -50,7 +51,7 @@ void init_qt_late() } // Disables the WindowContextHelpButtonHint by default on Qt::Sheet and Qt::Dialog widgets. // This hides the ? button on Windows, which only makes sense if you use QWhatsThis functionality. -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); #endif qPref::load();