diff options
| author | Sven Anderson <Sven.Anderson@snom.com> | 2011-09-08 17:40:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-15 10:16:12 +0100 |
| commit | 2b7d98ef8fbd6cf49326fa0bbf154e9bacbb7b49 (patch) | |
| tree | 250f2752acb679a237504ea70888b0ad5efa1251 /src/corelib/thread/qthread_win.cpp | |
| parent | 51b7d3c8b621c2de6f98f465f478ec574bb14195 (diff) | |
Allow to create a custom event dispatcher for specific QThreads.
QAbstractEventDispatcher() does no longer install itself into the current
thread. Instead the new methods QThread::setEventDispatcher() and
QCoreApplication::setEventDispatcher() allow to install a custom event
dispatcher into any QThread as long as there is no default event dispatcher
created yet. That is, before the thread has been started with
QThread::start() or, in case of the main thread, before QCoreApplication has
been instantiated.
Change-Id: I7367e13d8d8aebed5a5651260bb69b8818eb1b90
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/thread/qthread_win.cpp')
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 80d7f3ff63..5b74bad7ef 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -315,8 +315,11 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi QMutexLocker locker(&thr->d_func()->mutex); data->quitNow = thr->d_func()->exited; } - // ### TODO: allow the user to create a custom event dispatcher - createEventDispatcher(data); + + if (data->eventDispatcher) // custom event dispatcher set? + data->eventDispatcher->startingUp(); + else + createEventDispatcher(data); #if !defined(QT_NO_DEBUG) && defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) // sets the name of the current thread. |