Fix for leak in QFuture

To avoid leaking when converting a QFuture<T> to a QFuture<void> we need
to have a separate ref. counter for QFuture<T>. When the last QFuture<T>
goes out of scope, we need to clean out the result data.

Task-number: QTBUG-27224

Change-Id: I965a64a11fffbb191ab979cdd030a9aafd4436c2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

1 files changed, 22 insertions, 8 deletions

diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index 81ba1b0fd9..6d73755cfc 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -1251,18 +1251,32 @@ void tst_QFuture::throttling()
 
 void tst_QFuture::voidConversions()
 {
-    QFutureInterface<int> iface;
-    iface.reportStarted();
+    {
+        QFutureInterface<int> iface;
+        iface.reportStarted();
 
-    QFuture<int> intFuture(&iface);
+        QFuture<int> intFuture(&iface);
+        int value = 10;
+        iface.reportFinished(&value);
 
-    int value = 10;
-    iface.reportFinished(&value);
+        QFuture<void> voidFuture(intFuture);
+        voidFuture = intFuture;
+
+        QVERIFY(voidFuture == intFuture);
+    }
 
-    QFuture<void> voidFuture(intFuture);
-    voidFuture = intFuture;
+    {
+        QFuture<void> voidFuture;
+        {
+            QFutureInterface<QList<int> > iface;
+            iface.reportStarted();
 
-    QVERIFY(voidFuture == intFuture);
+            QFuture<QList<int> > listFuture(&iface);
+            iface.reportResult(QList<int>() << 1 << 2 << 3);
+            voidFuture = listFuture;
+        }
+        QCOMPARE(voidFuture.resultCount(), 0);
+    }
 }