summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-06-27 15:15:40 +0300
committerAndrew Knight <andrew.knight@digia.com>2014-06-28 13:00:46 +0200
commitc328b39181d7ca7e4babadee7469578b9fd84e3e (patch)
treea7fb645a0cf83495629f73c392548a94daeddf57
parent4c2953fbcd5db83ac6d202ba0d2b4262a1eba04b (diff)
winrt: Fix main thread dispatcher creation
Don't create a dispatcher for all adopted threads, only the main thread. This was causing the GUI thread to skip platform dispatcher creation. Change-Id: Id0de976f9def48e8d58efd20815b6fd18faebefa Reviewed-by: Andrew Knight <andrew.knight@digia.com>
-rw-r--r--src/corelib/thread/qthread_winrt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_winrt.cpp b/src/corelib/thread/qthread_winrt.cpp
index 215f04f744..85860dc545 100644
--- a/src/corelib/thread/qthread_winrt.cpp
+++ b/src/corelib/thread/qthread_winrt.cpp
@@ -197,6 +197,7 @@ QThreadData *QThreadData::current(bool createIfNecessary)
if (winmainThread) {
g->dispatch();
+ threadData->thread->d_func()->createEventDispatcher(threadData);
winmainThread = false;
}
}
@@ -210,7 +211,6 @@ void QAdoptedThread::init()
d->handle = Q_NULLPTR;
d->id = 0;
- d->createEventDispatcher(d->data);
}
/**************************************************************************