diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 23:22:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 7d21abfca39d2dcf98e3a81b1b7d8c73bd274cd1 (patch) | |
| tree | b96c1f79c8ee3f6a6d7761dbf2079a9042833c6b /tests/auto | |
| parent | 08c50599f149b7a8d448845dcb0b171e96342784 (diff) | |
Move QFutureSynchronizer back to QtCore
This class, too, belongs with QFuture.
Change-Id: I41a532ca66c156f1631e4b22ffc1a5879c854488
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/concurrent/concurrent.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro (renamed from tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturesynchronizer/tst_qfuturesynchronizer.cpp (renamed from tests/auto/concurrent/qfuturesynchronizer/tst_qfuturesynchronizer.cpp) | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/thread.pro | 1 |
4 files changed, 2 insertions, 2 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/corelib/thread/qfuturesynchronizer/qfuturesynchronizer.pro index a828213ade..a828213ade 100644 --- a/tests/auto/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro +++ b/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 index 5d643a47f1..6b48c96a57 100644 --- 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 ee64aeaa3f..f529bd8941 100644 --- 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 \ |