diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
| commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
| tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /src/corelib/thread/qthread_win.cpp | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
| parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
Diffstat (limited to 'src/corelib/thread/qthread_win.cpp')
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index e6c70ecb55..ef7bfc511d 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -137,7 +137,7 @@ QThreadData *QThreadData::current(bool createIfNecessary) } threadData->deref(); threadData->isAdopted = true; - threadData->threadId = reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())); + threadData->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); if (!QCoreApplicationPrivate::theMainThread) { QCoreApplicationPrivate::theMainThread = threadData->thread.load(); @@ -351,7 +351,7 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi qt_create_tls(); TlsSetValue(qt_current_thread_data_tls_index, data); - data->threadId = reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())); + data->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); QThread::setTerminationEnabled(false); |