diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-04 11:48:40 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-04 11:48:40 (GMT) |
| commit | 35cb81f92164bb136dc49b1ce7ebd76e6a79b289 (patch) | |
| tree | 0c650e5afe19fda85c9efceb77dc6877abda05ae /src | |
| parent | 0e4c54809a8195a199d85b143e042b0f5e53fb4c (diff) | |
| parent | 8f9b2a042fedda687f4ae87e3be09de20bce6354 (diff) | |
| download | Qt-35cb81f92164bb136dc49b1ce7ebd76e6a79b289.zip Qt-35cb81f92164bb136dc49b1ce7ebd76e6a79b289.tar.gz Qt-35cb81f92164bb136dc49b1ce7ebd76e6a79b289.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qcolordialog_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm index 5753954..a350be1 100644 --- a/src/gui/dialogs/qcolordialog_mac.mm +++ b/src/gui/dialogs/qcolordialog_mac.mm @@ -347,6 +347,7 @@ QT_USE_NAMESPACE } } + QAbstractEventDispatcher::instance()->interrupt(); if (mResultCode == NSCancelButton) mPriv->colorDialog()->reject(); else |