diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-03 14:11:36 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-05 02:30:58 +0100 |
| commit | 79c99466aa9a893036d6d4290a81cdbe658bc286 (patch) | |
| tree | ae00edf06b3046dc5b0a5bee271892f7694d546d /tests | |
| parent | b2b30468044d3b1a9afc66e5e33450493c7ce4b3 (diff) | |
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 <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib.pro | 1 | ||||
| -rw-r--r-- | tests/auto/integrationtests/integrationtests.pro | 1 | ||||
| -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 |