summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-23 14:47:26 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-23 14:48:44 +0200
commit90ac74c771b55dd6f8a9700e28278be446d8dd0d (patch)
treeda08fcb8fb85ad6a57c722d5c48e80e301c6b305 /src/corelib/kernel
parentce4d3435d75cf92d44b95522d24d0373a7aefb1b (diff)
Pass process event flags to QEventDispatcherWin32.
to enable it to use QWindowSystemInterface::sendWindowsEvents.
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp4
-rw-r--r--src/corelib/kernel/qeventdispatcher_win_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index d8fc208bf7..4f923bf23e 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -643,7 +643,7 @@ QEventDispatcherWin32::~QEventDispatcherWin32()
{
}
-bool QEventDispatcherWin32::dispatchGuiEvents()
+bool QEventDispatcherWin32::dispatchGuiEvents(QEventLoop::ProcessEventsFlags)
{
return false;
}
@@ -750,7 +750,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
if (!filterEvent(&msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
- dispatchGuiEvents();
+ dispatchGuiEvents(flags);
}
} else if (waitRet >= WAIT_OBJECT_0 && waitRet < WAIT_OBJECT_0 + nCount) {
d->activateEventNotifier(d->winEventNotifierList.at(waitRet - WAIT_OBJECT_0));
diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index 8d9de7e364..1329916b5f 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -104,7 +104,7 @@ public:
protected:
QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = 0);
- virtual bool dispatchGuiEvents();
+ virtual bool dispatchGuiEvents(QEventLoop::ProcessEventsFlags flags);
private:
friend LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp);