summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/concurrent/concurrent.pro1
-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.pro1
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 \