From c4e15c2ff15d21975410df9bc9615961e448b3d2 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Tue, 13 Oct 2009 15:53:06 +0200
Subject: Mac: fix autotest for qcolordialog

Rev-By: olivier
---
 src/gui/dialogs/qcolordialog_mac.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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()
-- 
cgit v0.12