diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-02-20 04:18:00 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-20 04:18:00 +0000 |
| commit | 3190edb07735bb47b7cf85c582d415ab6487a446 (patch) | |
| tree | 3e3dd3d0c3902ef82d93b99e235a8bc5d1b66309 /src/plugins/platforms | |
| parent | 13e51ea48758337397164a548d4c82d079067ae3 (diff) | |
| parent | 48577b2e7f17a26c1d903cb8ecbd30e41c231137 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 511c471519..17ded6ce59 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1131,7 +1131,7 @@ void QCocoaWindow::handleGeometryChange() // Guard against processing window system events during QWindow::setGeometry // calls, which Qt and Qt applications do not expect. if (!m_inSetGeometry) - QWindowSystemInterface::flushWindowSystemEvents(); + QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers); } void QCocoaWindow::handleExposeEvent(const QRegion ®ion) |