diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 09:36:06 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-24 11:18:22 +0000 |
commit | 3966ab51ff140f173f1f0c23fa3a9ef985c73d27 (patch) | |
tree | f30302c2c40e8d1b30e3ab589917eca5883aa3a2 /src/corelib/thread/qfutureinterface_p.h | |
parent | 0861c2176c6dc1c69b733c1a843c2db5ec8ea786 (diff) | |
parent | 4783de0473a288fdff7e5354c12315ba025ec7e0 (diff) |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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 ee8dfe1354..cf882dd9b4 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -162,7 +162,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; |