From 79c99466aa9a893036d6d4290a81cdbe658bc286 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Thu, 3 Nov 2011 14:11:36 +0100 Subject: [PATCH] Moved qobjectrace into integrationtests/ The qobjectrace test seems to belong to integrationtests/ since it tests the interaction between QObject and QThread (much in the same way integrationtests/qsharedpointer_and_qwidget/ tests the interaction between QSharedPointer and QWidget). Change-Id: I89f1dab7300c2ef23755d52a86479677ef021ef1 Reviewed-by: Jason McDonald --- tests/auto/corelib.pro | 1 - tests/auto/integrationtests/integrationtests.pro | 1 + tests/auto/{ => integrationtests}/qobjectrace/.gitignore | 0 tests/auto/{ => integrationtests}/qobjectrace/qobjectrace.pro | 0 .../auto/{ => integrationtests}/qobjectrace/tst_qobjectrace.cpp | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename tests/auto/{ => integrationtests}/qobjectrace/.gitignore (100%) rename tests/auto/{ => integrationtests}/qobjectrace/qobjectrace.pro (100%) rename tests/auto/{ => integrationtests}/qobjectrace/tst_qobjectrace.cpp (100%) 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 similarity index 100% rename from tests/auto/qobjectrace/.gitignore rename to tests/auto/integrationtests/qobjectrace/.gitignore diff --git a/tests/auto/qobjectrace/qobjectrace.pro b/tests/auto/integrationtests/qobjectrace/qobjectrace.pro similarity index 100% rename from tests/auto/qobjectrace/qobjectrace.pro rename to tests/auto/integrationtests/qobjectrace/qobjectrace.pro diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp similarity index 100% rename from tests/auto/qobjectrace/tst_qobjectrace.cpp rename to tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp