diff options
| author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-10-26 09:39:07 +0200 |
|---|---|---|
| committer | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-10-26 13:24:54 +0000 |
| commit | 6b831a3737054a12d96580d4153cb24cad5b8460 (patch) | |
| tree | be8e551f7812e45734b97cd0a4b1c7e5c3cbac47 | |
| parent | a71d404d7d6eb429ca2862342aab57c971934121 (diff) | |
Utils: Disable Native Dialogs when not supported
Task-number: QTBUG-118241
Change-Id: I1c7d16f44b5fdcba94dd2a6691a73dd2e549164b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/libs/utils/checkablemessagebox.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index 40f8b17076a..8e43debc4f7 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -53,15 +53,18 @@ static QMessageBox::StandardButton exec( msgBox.setTextFormat(Qt::RichText); msgBox.setTextInteractionFlags(Qt::LinksAccessibleByKeyboard | Qt::LinksAccessibleByMouse); +#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) if (HostOsInfo::isMacHost()) { // Message boxes on macOS cannot display links. // If the message contains a link, we need to disable native dialogs. - if (text.contains("<a ")) { -#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + if (text.contains("<a ")) + msgBox.setOptions(QMessageBox::Option::DontUseNativeDialog); + + // Workaround for QTBUG-118241 + if (!buttonTextOverrides.isEmpty()) msgBox.setOptions(QMessageBox::Option::DontUseNativeDialog); -#endif - } } +#endif if (decider.shouldAskAgain) { if (!decider.shouldAskAgain()) |