Cocoa: Fix QFontDialog, QColorDialog auto-tests

The new Cocoa event dispatcher made apparent some deficiencies in the
way the dialog helpers were being hidden. In particular, we would not stop
a dialog helper's modal loop when closing the dialog, resulting in the
auto-tests hanging. Also, since the QApplication event loop is runnig with
[NSApp run] in the stack, the previous workarounds are no longer needed.

Task-number: QTBUG-24321
Change-Id: Ifba713c286638d78a699c319a15683d09714f06f
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

1 files changed, 3 insertions, 8 deletions

diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index b989ea7c86..28afd91a09 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -983,14 +983,9 @@ void QFontDialog::setVisible(bool visible)
     Q_D(QFontDialog);
     if (d->canBeNativeDialog())
         d->setNativeDialogVisible(visible);
-    if (d->nativeDialogInUse) {
-        // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
-        // updates the state correctly, but skips showing the non-native version:
-        setAttribute(Qt::WA_DontShowOnScreen, true);
-    } else {
-        d->nativeDialogInUse = false;
-        setAttribute(Qt::WA_DontShowOnScreen, false);
-    }
+    // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
+    // updates the state correctly, but skips showing the non-native version:
+    setAttribute(Qt::WA_DontShowOnScreen, d->nativeDialogInUse);
     QDialog::setVisible(visible);
 }