diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-10-13 13:53:06 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-10-13 13:53:40 (GMT) |
| commit | c4e15c2ff15d21975410df9bc9615961e448b3d2 (patch) | |
| tree | 744fc869905e0f8b8751913dd486a46b29eb6264 /src/gui/dialogs | |
| parent | fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3 (diff) | |
| download | Qt-c4e15c2ff15d21975410df9bc9615961e448b3d2.zip Qt-c4e15c2ff15d21975410df9bc9615961e448b3d2.tar.gz Qt-c4e15c2ff15d21975410df9bc9615961e448b3d2.tar.bz2 | |
Mac: fix autotest for qcolordialog
Rev-By: olivier
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qcolordialog_mac.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/gui/dialogs/qcolordialog_mac.mm index f6b88bb..9e4fdd1 100644 --- a/src/gui/dialogs/qcolordialog_mac.mm +++ b/src/gui/dialogs/qcolordialog_mac.mm @@ -44,6 +44,7 @@ #include <qapplication.h> #include <qtimer.h> #include <qdialogbuttonbox.h> +#include <qabstracteventdispatcher.h> #include <private/qapplication_p.h> #include <private/qt_mac_p.h> #include <qdebug.h> @@ -319,6 +320,7 @@ QT_USE_NAMESPACE QMacCocoaAutoReleasePool pool; mDialogIsExecuting = true; [NSApp runModalForWindow:mColorPanel]; + QAbstractEventDispatcher::instance()->interrupt(); if (mResultCode == NSCancelButton) mPriv->colorDialog()->reject(); else @@ -411,7 +413,7 @@ void QColorDialogPrivate::openCocoaColorPanel(const QColor &initial, void QColorDialogPrivate::closeCocoaColorPanel() { - [[static_cast<QCocoaColorPanelDelegate *>(delegate) colorPanel] close]; + [static_cast<QCocoaColorPanelDelegate *>(delegate) onCancelClicked]; } void QColorDialogPrivate::releaseCocoaColorPanelDelegate() |