diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-27 23:15:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 23:50:10 +0200 |
| commit | 08c50599f149b7a8d448845dcb0b171e96342784 (patch) | |
| tree | f2fa89af503e02892f4998f624606bcc0977b641 /tests | |
| parent | 727f25214e870bc5d947a2f89ada9a4a4bd07365 (diff) | |
Move QFutureWatcher back to QtCore
This belongs with QFuture.
Change-Id: I555cd01c1d3890fbbaca4fd8a9170292ea4eb0fb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/concurrent/concurrent.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturewatcher/.gitignore (renamed from tests/auto/concurrent/qfuturewatcher/.gitignore) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro (renamed from tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp (renamed from tests/auto/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/thread/thread.pro | 1 |
5 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/concurrent/concurrent.pro b/tests/auto/concurrent/concurrent.pro index 80d19d30ec..14aff5d493 100644 --- a/tests/auto/concurrent/concurrent.pro +++ b/tests/auto/concurrent/concurrent.pro @@ -1,7 +1,6 @@ TEMPLATE=subdirs SUBDIRS=\ qfuturesynchronizer \ - qfuturewatcher \ qtconcurrentfilter \ qtconcurrentiteratekernel \ qtconcurrentmap \ diff --git a/tests/auto/concurrent/qfuturewatcher/.gitignore b/tests/auto/corelib/thread/qfuturewatcher/.gitignore index 1d778431c5..1d778431c5 100644 --- a/tests/auto/concurrent/qfuturewatcher/.gitignore +++ b/tests/auto/corelib/thread/qfuturewatcher/.gitignore diff --git a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro index 17c0363ce4..17c0363ce4 100644 --- a/tests/auto/concurrent/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/corelib/thread/qfuturewatcher/qfuturewatcher.pro diff --git a/tests/auto/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp index c68a33279c..c68a33279c 100644 --- a/tests/auto/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro index 0d3f442542..ee64aeaa3f 100644 --- a/tests/auto/corelib/thread/thread.pro +++ b/tests/auto/corelib/thread/thread.pro @@ -4,6 +4,7 @@ SUBDIRS=\ qatomicpointer \ qresultstore \ qfuture \ + qfuturewatcher \ qmutex \ qmutexlocker \ qreadlocker \ |