summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-06-19 11:39:21 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-05 08:42:03 (GMT)
commit0ffd973b76470e3636577f6335186b36b96e0b9b (patch)
treee3c0b950788bad4ee23286a1ac9081f2b3fb8ec3
parent2a6537f0629aaff53a42d993ad94ad4de3cd3030 (diff)
downloadQt-0ffd973b76470e3636577f6335186b36b96e0b9b.zip
Qt-0ffd973b76470e3636577f6335186b36b96e0b9b.tar.gz
Qt-0ffd973b76470e3636577f6335186b36b96e0b9b.tar.bz2
can show the Cocoa color panel repeatedly
Task-number: QTBUG-11188 Change-Id: I8491985dd6f04971a7aae2ccf7a53fd7294b799b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
-rw-r--r--src/gui/dialogs/qcolordialog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index ac4a1af..3fcb1a0 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1902,6 +1902,7 @@ void QColorDialog::setVisible(bool visible)
} else {
if (d->delegate) {
d->closeCocoaColorPanel();
+ QColorDialogPrivate::sharedColorPanelAvailable = true;
setAttribute(Qt::WA_DontShowOnScreen, false);
}
}