diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-05 01:52:00 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-11-05 01:53:17 +0100 |
commit | e79ceb97340699ed806aa021e1bda4b63fa6f3fe (patch) | |
tree | 7e9ff3f64e026562eb76b523aa6be615d466598b /src/gui/kernel/qwindowsysteminterface.cpp | |
parent | 825bb10d9bf40587828e4e589b199a9ffec255ce (diff) | |
parent | a21ffd44b3a13a9ef64a56e67f6e267292f0a8e2 (diff) |
Merge remote-tracking branch 'gerrit/5.8' into dev
Change-Id: Ib31cae9b57f6fb078739c409162bf2987eb430ad
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface.cpp')
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 1f2528dd5c..2b4c3e7bcd 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -720,7 +720,7 @@ bool QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ProcessEventsFl // deferredFlushWindowSystemEvents from the Gui thread. QMutexLocker locker(&QWindowSystemInterfacePrivate::flushEventMutex); QWindowSystemInterfacePrivate::FlushEventsEvent *e = new QWindowSystemInterfacePrivate::FlushEventsEvent(flags); - QWindowSystemInterfacePrivate::handleWindowSystemEvent<SynchronousDelivery>(e); + QWindowSystemInterfacePrivate::handleWindowSystemEvent<AsynchronousDelivery>(e); QWindowSystemInterfacePrivate::eventsFlushed.wait(&QWindowSystemInterfacePrivate::flushEventMutex); } else { sendWindowSystemEvents(flags); |