From 2f854e50908c342fddb17d6e72b7fb186f9c46de Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 30 Jan 2013 10:28:27 +0100 Subject: Fix QColorDialog::DontUseNativeDialog usage Task-number: QTBUG-29387 Change-Id: I97b3267981a0dcfdc95469cd0725b52ac4845346 Reviewed-by: Friedemann Kleint --- src/widgets/dialogs/qcolordialog.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 5adb4ba6da..7ba8f60f71 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1856,15 +1856,12 @@ void QColorDialog::setVisible(bool visible) } #else - if (!(options() & DontUseNativeDialog)) + if (!(options() & DontUseNativeDialog) && d->nativeDialogInUse) { 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); } else { - d->nativeDialogInUse = false; setAttribute(Qt::WA_DontShowOnScreen, false); } #endif -- cgit v1.2.3