diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 20:21:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-06 22:20:08 +0000 |
| commit | 857912b605ea11f6f1e782edfb40555d831eb9ad (patch) | |
| tree | 49a4174a44e06ba55e9253e2e7f6f45fe1764c5c /src/corelib/thread/qthread.cpp | |
| parent | 5aeafcea467ced35adca1d762d38bfbba2b59e1f (diff) | |
| parent | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 8a797772fc..4aac24f454 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -149,16 +149,12 @@ QThreadPrivate::QThreadPrivate(QThreadData *d) exited(false), returnCode(-1), stackSize(0), priority(QThread::InheritPriority), data(d) { -#if defined (Q_OS_UNIX) - thread_id = 0; -#elif defined (Q_OS_WIN) +#if defined (Q_OS_WIN) handle = 0; # ifndef Q_OS_WINRT id = 0; # endif waiters = 0; -#endif -#if defined (Q_OS_WIN) terminationEnabled = true; terminatePending = false; #endif |