diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-09-10 12:19:09 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-10-08 05:34:28 +0000 |
| commit | 29208fa07c1b9f656ea2535696828385b7832226 (patch) | |
| tree | e784dcdd1896f836d81ebeb4f6eb67426923b9f9 /src/corelib/thread/qthread_p.h | |
| parent | 05b8ba51550127c85cd2db5cb819b695b56c57ce (diff) | |
winrt: Explicitly set main thread in QCoreApplication's constructor
For winrt we cannot rely on the fact, that QThread::current will be called
from the correct thread for the first time. The application's main entry
point creates a suspended thread and starts it right afterwards. At that
moment, other functionality (QLoggingRegistry for example) might have
called QThread::current, which set the wrong thread as the main thread. In
order to avoid this situation, the main thread is explicitly set in
QCoreApplication's constructor.
Task-number: QTBUG-66418
Change-Id: I8b6347357a80eb395ae758bd3d420adef0826751
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
| -rw-r--r-- | src/corelib/thread/qthread_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 64e3f33191..7d9442ab79 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -243,6 +243,9 @@ public: ~QThreadData(); static Q_AUTOTEST_EXPORT QThreadData *current(bool createIfNecessary = true); +#ifdef Q_OS_WINRT + static void setMainThread(); +#endif static void clearCurrentThreadData(); static QThreadData *get2(QThread *thread) { Q_ASSERT_X(thread != 0, "QThread", "internal error"); return thread->d_func()->data; } |