summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib.pro1
-rw-r--r--tests/auto/integrationtests/integrationtests.pro1
-rw-r--r--tests/auto/integrationtests/qobjectrace/.gitignore (renamed from tests/auto/qobjectrace/.gitignore)0
-rw-r--r--tests/auto/integrationtests/qobjectrace/qobjectrace.pro (renamed from tests/auto/qobjectrace/qobjectrace.pro)0
-rw-r--r--tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp (renamed from tests/auto/qobjectrace/tst_qobjectrace.cpp)0
5 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index ebdc1cd8c5..007779a70b 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -1,5 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
corelib \
- qobjectrace \
utf8
diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro
index 33d54e22e9..053f007b10 100644
--- a/tests/auto/integrationtests/integrationtests.pro
+++ b/tests/auto/integrationtests/integrationtests.pro
@@ -17,6 +17,7 @@ SUBDIRS=\
qfocusevent \
qmultiscreen \
qnetworkaccessmanager_and_qprogressdialog \
+ qobjectrace \
qsharedpointer_and_qwidget \
windowsmobile \
diff --git a/tests/auto/qobjectrace/.gitignore b/tests/auto/integrationtests/qobjectrace/.gitignore
index 9d3f96e0a0..9d3f96e0a0 100644
--- a/tests/auto/qobjectrace/.gitignore
+++ b/tests/auto/integrationtests/qobjectrace/.gitignore
diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/integrationtests/qobjectrace/qobjectrace.pro
index 9a0d8e58c4..9a0d8e58c4 100644
--- a/tests/auto/qobjectrace/qobjectrace.pro
+++ b/tests/auto/integrationtests/qobjectrace/qobjectrace.pro
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp
index 8cb7845e78..8cb7845e78 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp