diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
| commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
| tree | 8df5223ac114d758c2112a8fc787992175556418 /src/gui/kernel/qguiapplication.cpp | |
| parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index e7fdbde432..8c71fb23de 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1630,8 +1630,9 @@ void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePriv QWindowSystemInterfacePrivate::ApplicationStateChangedEvent * changeEvent = static_cast<QWindowSystemInterfacePrivate::ApplicationStateChangedEvent *>(e); QGuiApplicationPrivate::setApplicationState(changeEvent->newState, changeEvent->forcePropagate); } break; - case QWindowSystemInterfacePrivate::FlushEvents: - QWindowSystemInterface::deferredFlushWindowSystemEvents(); + case QWindowSystemInterfacePrivate::FlushEvents: { + QWindowSystemInterfacePrivate::FlushEventsEvent *flushEventsEvent = static_cast<QWindowSystemInterfacePrivate::FlushEventsEvent *>(e); + QWindowSystemInterface::deferredFlushWindowSystemEvents(flushEventsEvent->flags); } break; case QWindowSystemInterfacePrivate::Close: QGuiApplicationPrivate::processCloseEvent( |