diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-14 11:33:02 +0100 |
| commit | 27432d40f2500b11780398f6c7d67719050dae6c (patch) | |
| tree | 97f9a60af2d520d66fa7ff802ccddad56e0cadaf /src/corelib/thread | |
| parent | 071a120400b17eaa0b414a0ed262b0a090908679 (diff) | |
| parent | 10ecbc4041cb7db004f4ed4d40ce082553d75844 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I2bd2e61bae1eab4fc74fa6accd741ed9ae1f0669
Diffstat (limited to 'src/corelib/thread')
| -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 a14c193bad..e6c70ecb55 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -96,7 +96,7 @@ void qt_create_tls() { if (qt_current_thread_data_tls_index != TLS_OUT_OF_INDEXES) return; - static QMutex mutex; + static QBasicMutex mutex; QMutexLocker locker(&mutex); qt_current_thread_data_tls_index = TlsAlloc(); } @@ -166,7 +166,7 @@ void QAdoptedThread::init() static QVector<HANDLE> qt_adopted_thread_handles; static QVector<QThread *> qt_adopted_qthreads; -static QMutex qt_adopted_thread_watcher_mutex; +static QBasicMutex qt_adopted_thread_watcher_mutex; static DWORD qt_adopted_thread_watcher_id = 0; static HANDLE qt_adopted_thread_wakeup = 0; |