diff options
| author | axis <qt-info@nokia.com> | 2009-05-06 06:55:50 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-06 06:55:50 (GMT) |
| commit | b246f8a8beab858468777f433f49faf62edcb07e (patch) | |
| tree | 120844101aca654bf2f69fef5ea2647bf0bee13a /src/corelib/concurrent | |
| parent | 5791fde8526afc49cdbeee080ead9e8a305e3cd5 (diff) | |
| parent | a1d2c3c589a03cc427dcc22d109003576add9500 (diff) | |
| download | Qt-b246f8a8beab858468777f433f49faf62edcb07e.zip Qt-b246f8a8beab858468777f433f49faf62edcb07e.tar.gz Qt-b246f8a8beab858468777f433f49faf62edcb07e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/concurrent')
| -rw-r--r-- | src/corelib/concurrent/qfutureinterface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/concurrent/qfutureinterface.h b/src/corelib/concurrent/qfutureinterface.h index 85d03c9..345bebe 100644 --- a/src/corelib/concurrent/qfutureinterface.h +++ b/src/corelib/concurrent/qfutureinterface.h @@ -165,6 +165,8 @@ public: QFutureInterface &operator=(const QFutureInterface &other) { + if (referenceCountIsOne()) + resultStore().clear(); QFutureInterfaceBase::operator=(other); return *this; } |