Move QFutureSynchronizer back to QtCore

This class, too, belongs with QFuture.

Change-Id: I41a532ca66c156f1631e4b22ffc1a5879c854488
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

3 files changed, 0 insertions, 164 deletions

diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro
index 14aff5d493..20bad24fc1 100644
--- a/tests/auto/concurrent/concurrent.pro
+++ b/tests/auto/concurrent/concurrent.pro
@@ -1,6 +1,5 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   qfuturesynchronizer \
    qtconcurrentfilter \
    qtconcurrentiteratekernel \
    qtconcurrentmap \
diff --git a/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
deleted file mode 100644
index a828213ade..0000000000
--- a/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG += testcase parallel_test
-TARGET = tst_qfuturesynchronizer
-QT = core testlib concurrent
-SOURCES = tst_qfuturesynchronizer.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
deleted file mode 100644
index 5d643a47f1..0000000000
--- a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtTest>
-
-#include <QtConcurrent/qfuturesynchronizer.h>
-#include <QtCore/qfuture.h>
-
-class tst_QFutureSynchronizer : public QObject
-{
-    Q_OBJECT
-
-
-private Q_SLOTS:
-    void construction();
-    void addFuture();
-    void cancelOnWait();
-    void clearFutures();
-    void futures();
-    void setFuture();
-    void waitForFinished();
-};
-
-
-void tst_QFutureSynchronizer::construction()
-{
-
-    QFuture<void> future;
-    QFutureSynchronizer<void> synchronizer;
-    QFutureSynchronizer<void> synchronizerWithFuture(future);
-
-    QCOMPARE(synchronizer.futures().size(), 0);
-    QCOMPARE(synchronizerWithFuture.futures().size(), 1);
-}
-
-void tst_QFutureSynchronizer::addFuture()
-{
-    QFutureSynchronizer<void> synchronizer;
-
-    synchronizer.addFuture(QFuture<void>());
-    QFuture<void> future;
-    synchronizer.addFuture(future);
-    synchronizer.addFuture(future);
-
-    QCOMPARE(synchronizer.futures().size(), 3);
-}
-
-void tst_QFutureSynchronizer::cancelOnWait()
-{
-    QFutureSynchronizer<void> synchronizer;
-    QVERIFY(!synchronizer.cancelOnWait());
-    synchronizer.setCancelOnWait(true);
-    QVERIFY(synchronizer.cancelOnWait());
-    synchronizer.setCancelOnWait(false);
-    QVERIFY(!synchronizer.cancelOnWait());
-    synchronizer.setCancelOnWait(true);
-    QVERIFY(synchronizer.cancelOnWait());
-}
-
-void tst_QFutureSynchronizer::clearFutures()
-{
-    QFutureSynchronizer<void> synchronizer;
-    synchronizer.clearFutures();
-    QVERIFY(synchronizer.futures().isEmpty());
-
-    synchronizer.addFuture(QFuture<void>());
-    QFuture<void> future;
-    synchronizer.addFuture(future);
-    synchronizer.addFuture(future);
-    synchronizer.clearFutures();
-    QVERIFY(synchronizer.futures().isEmpty());
-}
-
-void tst_QFutureSynchronizer::futures()
-{
-    QFutureSynchronizer<void> synchronizer;
-
-    QList<QFuture<void> > futures;
-    for (int i=0; i<100; i++) {
-        QFuture<void> future;
-        futures.append(future);
-        synchronizer.addFuture(future);
-    }
-
-    QCOMPARE(futures, synchronizer.futures());
-}
-
-void tst_QFutureSynchronizer::setFuture()
-{
-    QFutureSynchronizer<void> synchronizer;
-
-    for (int i=0; i<100; i++) {
-        synchronizer.addFuture(QFuture<void>());
-    }
-    QCOMPARE(synchronizer.futures().size(), 100);
-
-    QFuture<void> future;
-    synchronizer.setFuture(future);
-    QCOMPARE(synchronizer.futures().size(), 1);
-    QCOMPARE(synchronizer.futures().first(), future);
-}
-
-void tst_QFutureSynchronizer::waitForFinished()
-{
-    QFutureSynchronizer<void> synchronizer;
-
-    for (int i=0; i<100; i++) {
-        synchronizer.addFuture(QFuture<void>());
-    }
-    synchronizer.waitForFinished();
-    const QList<QFuture<void> > futures = synchronizer.futures();
-
-    for (int i=0; i<100; i++) {
-        QVERIFY(futures.at(i).isFinished());
-    }
-}
-
-QTEST_MAIN(tst_QFutureSynchronizer)
-
-#include "tst_qfuturesynchronizer.moc"