diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 12:26:36 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-16 13:54:01 +0000 |
| commit | b39adf8945616dfc02df7177dccef6b051a1903b (patch) | |
| tree | 21a91178abc484b8cf191eec461f80678a107b33 /src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | |
| parent | 38e935701c0faeb19b9b1493dc2d6d60c6bc3ca3 (diff) | |
| parent | 90c425642dfeae4564b43dacf15f80479962e910 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm index 60c4c1a8ca..e53c085e41 100644 --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm @@ -45,6 +45,7 @@ #include "qcocoacolordialoghelper.h" #include "qcocoahelpers.h" +#include "qcocoaeventdispatcher.h" #import <AppKit/AppKit.h> @@ -231,6 +232,10 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate); // cleanup of modal sessions. Do this before showing the native dialog, otherwise it will // close down during the cleanup. qApp->processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers); + + // Make sure we don't interrupt the runModalForWindow call. + QCocoaEventDispatcher::clearCurrentThreadCocoaEventDispatcherInterruptFlag(); + [NSApp runModalForWindow:mColorPanel]; mDialogIsExecuting = false; return (mResultCode == NSOKButton); |