diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-08-06 05:37:02 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-23 14:16:31 (GMT) |
| commit | b2a91d3a918524f7e45f0f19d3f0efa4db0db709 (patch) | |
| tree | c8db024f8b74fcad7aeb1f9b89744086b1c0a301 | |
| parent | 29f11bf9316cda91ab7392e664fca97a08e73b70 (diff) | |
| download | Qt-b2a91d3a918524f7e45f0f19d3f0efa4db0db709.zip Qt-b2a91d3a918524f7e45f0f19d3f0efa4db0db709.tar.gz Qt-b2a91d3a918524f7e45f0f19d3f0efa4db0db709.tar.bz2 | |
OSX: Disable window restoration for the Mac color panel
because if it is automatically restored it's out of the application's
control, so the user's interaction will be ignored. Change
I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows
by default, but the dialog helpers generate windows which aren't
affected by that.
Task-number: QTBUG-31750
Change-Id: Ida063f2d36ab038af5e85de7dfa2acf61cb6dda2
(cherry-picked from qtbase commit 69554e458669c941130c2dc03d42a59ffd00e39e)
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| -rw-r--r-- | src/gui/dialogs/qcolordialog_mac.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm index 7d04c87..3076729 100644 --- a/src/gui/dialogs/qcolordialog_mac.mm +++ b/src/gui/dialogs/qcolordialog_mac.mm @@ -120,6 +120,11 @@ QT_USE_NAMESPACE mDialogIsExecuting = false; mResultSet = false; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) + [mColorPanel setRestorable:NO]; +#endif + if (mHackedPanel) { [self relayout]; |