diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-19 14:56:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-19 16:02:52 +0100 |
| commit | 48577b2e7f17a26c1d903cb8ecbd30e41c231137 (patch) | |
| tree | e7498f68a15e2e18b8412eefe7f248d379d94d99 /src/plugins/platforms/cocoa | |
| parent | fa0906bc5664913f232721d611e6e7906892d766 (diff) | |
| parent | 6c6ace9d23f90845fd424e474d38fe30f070775e (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Conflicts:
src/plugins/sqldrivers/psql/qsql_psql.cpp
Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -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 ca580e7d17..d0593a473d 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) |