summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-11-13 09:25:20 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-11-13 09:25:20 (GMT)
commitb664d54867139b371e158f1c63076c4a970cbb2a (patch)
tree455de47287676160557b40fc67ea3d6c0f15f209 /src
parent99b19431e6846a36a65f23d21a95140a081d1f1a (diff)
parentc785d92153d23b836451b0643424b9871bcc4be9 (diff)
downloadQt-b664d54867139b371e158f1c63076c4a970cbb2a.zip
Qt-b664d54867139b371e158f1c63076c4a970cbb2a.tar.gz
Qt-b664d54867139b371e158f1c63076c4a970cbb2a.tar.bz2
Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstream
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 3050b82..0518e24 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -675,6 +675,11 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
bool seenWM_QT_SENDPOSTEDEVENTS = false;
bool needWM_QT_SENDPOSTEDEVENTS = false;
do {
+ if (! (flags & QEventLoop::EventLoopExec)) {
+ // when called "manually", always send posted events
+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
+ }
+
DWORD waitRet = 0;
HANDLE pHandles[MAXIMUM_WAIT_OBJECTS - 1];
QVarLengthArray<MSG> processedTimers;