diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-01-30 10:28:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-30 15:17:10 +0100 |
| commit | 2f854e50908c342fddb17d6e72b7fb186f9c46de (patch) | |
| tree | 6d5a8b9c0eb9f9eb168626ee9e6e31796d1ac717 /src/widgets | |
| parent | ffea8e98f712a8e2158a2bb843a649e96eea991e (diff) | |
Fix QColorDialog::DontUseNativeDialog usage
Task-number: QTBUG-29387
Change-Id: I97b3267981a0dcfdc95469cd0725b52ac4845346
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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 |