Revert "QtConcurrent: Fix for leak in QFuture"

This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3

That commit contains new symbols added in a patch release of Qt. That is not permitted.

Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 8 insertions, 22 deletions

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