summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/auto/corelib/tools/collections/.gitignore (renamed from tests/auto/other/collections/.gitignore)0
-rw-r--r--tests/auto/corelib/tools/collections/collections.pro (renamed from tests/auto/other/collections/collections.pro)0
-rw-r--r--tests/auto/corelib/tools/collections/tst_collections.cpp (renamed from tests/auto/other/collections/tst_collections.cpp)0
-rw-r--r--tests/auto/corelib/tools/tools.pro1
-rw-r--r--tests/auto/other/other.pro1
5 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/other/collections/.gitignore b/tests/auto/corelib/tools/collections/.gitignore
index dcd9d49ec0..dcd9d49ec0 100644
--- a/tests/auto/other/collections/.gitignore
+++ b/tests/auto/corelib/tools/collections/.gitignore
diff --git a/tests/auto/other/collections/collections.pro b/tests/auto/corelib/tools/collections/collections.pro
index 51ea667f58..51ea667f58 100644
--- a/tests/auto/other/collections/collections.pro
+++ b/tests/auto/corelib/tools/collections/collections.pro
diff --git a/tests/auto/other/collections/tst_collections.cpp b/tests/auto/corelib/tools/collections/tst_collections.cpp
index 17ed9c8a45..17ed9c8a45 100644
--- a/tests/auto/other/collections/tst_collections.cpp
+++ b/tests/auto/corelib/tools/collections/tst_collections.cpp
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
index 1ef8e77071..352cf88d44 100644
--- a/tests/auto/corelib/tools/tools.pro
+++ b/tests/auto/corelib/tools/tools.pro
@@ -1,5 +1,6 @@
TEMPLATE=subdirs
SUBDIRS=\
+ collections \
qalgorithms \
qarraydata \
qarraydata_strictiterators \
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index e6017168d0..0ae94fe415 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -2,7 +2,6 @@ TEMPLATE=subdirs
SUBDIRS=\
# atwrapper \ # QTBUG-19452
baselineexample \
- collections \
compiler \
d3dcompiler \
gestures \