diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-31 10:36:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 11:29:08 +0100 |
| commit | e277575987657aa07444eea9bee99769f039d3b0 (patch) | |
| tree | 549c419596e340c8ad123df44fc75662ed47b2a7 /src/corelib/concurrent | |
| parent | 5761d8546f3ff3802cae85ed5224c2bdd9524452 (diff) | |
Fix most warnings about assignments of QAtomicInt.
Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qfuturewatcher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp index c9a16a8bbf..e405896f0b 100644 --- a/src/corelib/concurrent/qfuturewatcher.cpp +++ b/src/corelib/concurrent/qfuturewatcher.cpp @@ -400,7 +400,7 @@ void QFutureWatcherBase::disconnectOutputInterface(bool pendingAssignment) { if (pendingAssignment) { Q_D(QFutureWatcherBase); - d->pendingResultsReady = 0; + d->pendingResultsReady.store(0); qDeleteAll(d->pendingCallOutEvents); d->pendingCallOutEvents.clear(); d->finished = false; @@ -439,7 +439,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) emit q->finished(); break; case QFutureCallOutEvent::Canceled: - pendingResultsReady = 0; + pendingResultsReady.store(0); emit q->canceled(); break; case QFutureCallOutEvent::Paused: |