summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-14 10:01:09 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-14 10:01:09 (GMT)
commit6a8f901d6545a3c68bc398150b641694b68ddf0a (patch)
tree07841339fb9f83970f62733a2adb346f0aad36ca /src
parentedcc782002c8b93e60dabfc0859c209a4eeedf10 (diff)
parent2fc228b4d2fbe6ca44389e9e065272030775c87b (diff)
downloadQt-6a8f901d6545a3c68bc398150b641694b68ddf0a.zip
Qt-6a8f901d6545a3c68bc398150b641694b68ddf0a.tar.gz
Qt-6a8f901d6545a3c68bc398150b641694b68ddf0a.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 3a4ecce..8e4c461 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -62,6 +62,7 @@
#include <qvarlengtharray.h>
#include <qdesktopwidget.h>
#include <stdlib.h>
+#include <qabstracteventdispatcher.h>
#include "ui_qfiledialog.h"
QT_BEGIN_NAMESPACE
@@ -245,6 +246,8 @@ QT_USE_NAMESPACE
mReturnCode = [mSavePanel
runModalForDirectory:mCurrentDir
file:selectable ? filename : @"untitled"];
+
+ QAbstractEventDispatcher::instance()->interrupt();
return (mReturnCode == NSOKButton);
}