summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tests/auto/network.pro8
-rw-r--r--tests/auto/other/other.pro1
-rw-r--r--tests/auto/other/qobjectperformance/.gitignore (renamed from tests/auto/qobjectperformance/.gitignore)0
-rw-r--r--tests/auto/other/qobjectperformance/qobjectperformance.pro (renamed from tests/auto/qobjectperformance/qobjectperformance.pro)0
-rw-r--r--tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp (renamed from tests/auto/qobjectperformance/tst_qobjectperformance.cpp)0
6 files changed, 2 insertions, 9 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index e9d3bfd167..4b22604dea 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -6,7 +6,7 @@ SUBDIRS += \
host.pro \
gui.pro \
integrationtests \
- network.pro \
+ network \
opengl \
sql \
testlib \
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
deleted file mode 100644
index d4d07fa426..0000000000
--- a/tests/auto/network.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-# The tests in this .pro file _MUST_ use QtCore and QtNetwork only
-# (i.e. QT=core network).
-# The test system is allowed to run these tests before the rest of Qt has
-# been compiled.
-TEMPLATE=subdirs
-SUBDIRS=\
- network \
- qobjectperformance
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 0224bb416c..fe36713117 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -4,6 +4,7 @@ SUBDIRS=\
baselineexample \
compiler \
headersclean \
+ qobjectperformance \
qtokenautomaton \
cross_compile: SUBDIRS -= \
diff --git a/tests/auto/qobjectperformance/.gitignore b/tests/auto/other/qobjectperformance/.gitignore
index 028ca89aad..028ca89aad 100644
--- a/tests/auto/qobjectperformance/.gitignore
+++ b/tests/auto/other/qobjectperformance/.gitignore
diff --git a/tests/auto/qobjectperformance/qobjectperformance.pro b/tests/auto/other/qobjectperformance/qobjectperformance.pro
index 189f8eeb2a..189f8eeb2a 100644
--- a/tests/auto/qobjectperformance/qobjectperformance.pro
+++ b/tests/auto/other/qobjectperformance/qobjectperformance.pro
diff --git a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp
index 26145a0df4..26145a0df4 100644
--- a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp
+++ b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp