Move QFutureSynchronizer back to QtCore

This class, too, belongs with QFuture.

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

diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 20a9356..f30f75e 100644 (file)
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -12,7 +12,6 @@ load(qt_module)
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 
 SOURCES += \
-        qfuturesynchronizer.cpp \
         qtconcurrentfilter.cpp \
         qtconcurrentmap.cpp \
         qtconcurrentthreadengine.cpp \
@@ -20,7 +19,6 @@ SOURCES += \
 
 HEADERS += \
         qtconcurrent_global.h \
-        qfuturesynchronizer.h \
         qtconcurrentcompilertest.h \
         qtconcurrentexception.h \
         qtconcurrentfilter.h \

diff --git a/src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp
similarity index 100%
rename from src/concurrent/doc/snippets/code/src_concurrent_qfuturesynchronizer.cpp
rename to src/corelib/doc/snippets/code/src_corelib_thread_qfuturesynchronizer.cpp

diff --git a/src/concurrent/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h
similarity index 97%
rename from src/concurrent/qfuturesynchronizer.h
rename to src/corelib/thread/qfuturesynchronizer.h
index b82e968..12edcfb 100644 (file)
--- a/src/concurrent/qfuturesynchronizer.h
+++ b/src/corelib/thread/qfuturesynchronizer.h
@@ -42,11 +42,9 @@
 #ifndef QFUTURESYNCHRONIZER_H
 #define QFUTURESYNCHRONIZER_H
 
-#include <QtConcurrent/qtconcurrent_global.h>
-
 #include <QtCore/qfuture.h>
 
-#ifndef QT_NO_CONCURRENT
+#ifndef QT_NO_QFUTURE
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
@@ -117,6 +115,6 @@ protected:
 QT_END_NAMESPACE
 QT_END_HEADER
 
-#endif // QT_NO_CONCURRENT
+#endif // QT_NO_QFUTURE
 
 #endif // QFUTURESYNCHRONIZER_H

diff --git a/src/concurrent/qfuturesynchronizer.cpp b/src/corelib/thread/qfuturesynchronizer.qdoc
similarity index 98%
rename from src/concurrent/qfuturesynchronizer.cpp
rename to src/corelib/thread/qfuturesynchronizer.qdoc
index 69ea325..903dc89 100644 (file)
--- a/src/concurrent/qfuturesynchronizer.cpp
+++ b/src/corelib/thread/qfuturesynchronizer.qdoc
@@ -57,7 +57,7 @@
     an easy way to ensure that all futures have finished before returning from
     a function:
     
-    \snippet code/src_concurrent_qfuturesynchronizer.cpp 0
+    \snippet code/src_corelib_thread_qfuturesynchronizer.cpp 0
     
     The behavior of waitForFinished() can be changed using the
     setCancelOnWait() function. Calling setCancelOnWait(true) will cause

diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index 6e341be..7247f29 100644 (file)
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -14,6 +14,7 @@ HEADERS += thread/qmutex.h \
            thread/qresultstore.h \
            thread/qfuture.h \
            thread/qfutureinterface.h \
+           thread/qfuturesynchronizer.h \
            thread/qfuturewatcher.h \
            thread/qbasicatomic.h \
            thread/qgenericatomic.h \

diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro
index 14aff5d..20bad24 100644 (file)
--- 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/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro
similarity index 100%
rename from tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro
rename to tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro

diff --git a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
similarity index 99%
rename from tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
rename to tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
index 5d643a4..6b48c96 100644 (file)
--- a/tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
+++ b/tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp
@@ -41,7 +41,7 @@
 
 #include <QtTest>
 
-#include <QtConcurrent/qfuturesynchronizer.h>
+#include <QtCore/qfuturesynchronizer.h>
 #include <QtCore/qfuture.h>
 
 class tst_QFutureSynchronizer : public QObject

diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro
index ee64aea..f529bd8 100644 (file)
--- a/tests/auto/corelib/thread/thread.pro
+++ b/tests/auto/corelib/thread/thread.pro
@@ -4,6 +4,7 @@ SUBDIRS=\
     qatomicpointer \
     qresultstore \
     qfuture \
+    qfuturesynchronizer \
     qfuturewatcher \
     qmutex \
     qmutexlocker \