diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:51:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-17 19:57:54 +0000 |
| commit | 86c5a337e3b123f2e41c8b15b416f39655519acd (patch) | |
| tree | efa0f720a190889b3d31ddbd07cee0495b8a15d4 /src/corelib/thread/qthread.cpp | |
| parent | 47ca3f78139ad51a5018dcdad27fa5caf817f08d (diff) | |
| parent | 6620045fcaada61a2897195f32c0ee35beebc37b (diff) | |
Merge "Merge dev into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/thread/qthread.cpp')
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index f689ad4d21..48b94abae5 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE */ QThreadData::QThreadData(int initialRefCount) - : _ref(initialRefCount), loopLevel(0), thread(0), threadId(0), + : _ref(initialRefCount), loopLevel(0), scopeLevel(0), thread(0), threadId(0), eventDispatcher(0), quitNow(false), canWait(true), isAdopted(false), requiresCoreApplication(true) { |