diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-23 07:12:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-23 09:24:36 +0100 |
commit | 38c1057f696c4e3f168305091413428d99007c43 (patch) | |
tree | 49c3ef009cc723151298bfc9eef85bb6fa5910be /src/corelib/thread/qfutureinterface_p.h | |
parent | 48d7db6b3119ee27d9ae6b1bd0fdb24333f44756 (diff) | |
parent | e2b856d56290e9b3eaaf889b3e0a08badbaa6046 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
This also reverts commit 0d2f0164f45cb626c40a7c95026ba00fa56ac249.
Conflicts:
header.BSD-NEW
qmake/Makefile.win32
src/openglextensions/qopenglextensions.cpp
src/openglextensions/qopenglextensions.h
src/winmain/qtmain_win.cpp
src/winmain/qtmain_winrt.cpp
tools/configure/configureapp.cpp
util/glgen/qopenglextensions.cpp.header
util/glgen/qopenglextensions.h.header
Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8
Diffstat (limited to 'src/corelib/thread/qfutureinterface_p.h')
-rw-r--r-- | src/corelib/thread/qfutureinterface_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h index f5f0e7047f..5245b76072 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -161,7 +161,7 @@ public: int m_progressValue; // TQ int m_progressMinimum; // TQ int m_progressMaximum; // TQ - QFutureInterfaceBase::State state; + QAtomicInt state; // reads and writes can happen unprotected, both must be atomic QElapsedTimer progressTime; QWaitCondition pausedWaitCondition; QtPrivate::ResultStoreBase m_results; |