From e277575987657aa07444eea9bee99769f039d3b0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 31 Oct 2011 10:36:57 +0100 Subject: Fix most warnings about assignments of QAtomicInt. Change-Id: Ide409d72d2637b68ec2a85aaca4bc783a7e911e7 Reviewed-by: Bradley T. Hughes --- src/corelib/concurrent/qfuturewatcher.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/concurrent/qfuturewatcher.cpp') 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: -- cgit v1.2.3