diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:26 +0200 |
commit | 6feec9da93032d11a768802ac2187d9d4153b1ec (patch) | |
tree | dada90d2b99127de0be833ded5554b37169f3432 /src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | |
parent | d5e3dca8c56f60e0da5d707dbbe0c424b75c947a (diff) | |
parent | c3605980d95f28d8ab6dc11eb349ad87ed3adaa9 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I34b5e290233d0869fbafac094a939aec2bf83fd5
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index 5f54110777..5c27cf8059 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -348,7 +348,7 @@ static inline void qt_mac_waitForMoreEvents(NSString *runLoopMode = NSDefaultRun bool QCocoaEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags) { Q_D(QCocoaEventDispatcher); - d->interrupt = false; + QBoolBlocker interruptBlocker(d->interrupt, false); bool interruptLater = false; QtCocoaInterruptDispatcher::cancelInterruptLater(); |