diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 07:37:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-16 12:35:36 +0100 |
| commit | 90c425642dfeae4564b43dacf15f80479962e910 (patch) | |
| tree | 7e51683195210b3c70c04a8a0753ee272af1cd4c /src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | |
| parent | 1a43199fcea1bcec1ebf1a1a12cd3dcb942d67b4 (diff) | |
| parent | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/common/linux-android.conf
src/gui/opengl/qopengl.h
src/network/socket/qnativesocketengine_winrt.cpp
src/network/socket/qnativesocketengine_winrt_p.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
sync.profile
Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
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 3a5a0c8e78..7f81e313cb 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> @@ -322,6 +323,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); |