diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-29 12:31:41 +0100 |
| commit | 947cace7993807d173656300f4440ae5166624fe (patch) | |
| tree | 39eb81b1bda6a92a3358b1c489e9cfce6d241f17 /src/corelib/thread/qfutureinterface_p.h | |
| parent | 5e921a18b2a098f68dbce368f9d20447939b3510 (diff) | |
| parent | 7eb4be9db89d40ea2cc090e7a562bdd588708607 (diff) | |
Merge 5.8 into 5.8.0
Change-Id: If74f0ade36baa9454ebcffb8d6bdd14ac963c1cb
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; |