From 9ceb3b4f6f67cbfe3fb94402bb0f061f77b6da85 Mon Sep 17 00:00:00 2001
From: Jo Asplin <jo.asplin@nokia.com>
Date: Fri, 4 Nov 2011 16:43:53 +0100
Subject: [PATCH] Moved qobjectperformance into other/

The qobjectperformance test is a kind
of performance test that asserts that the
time it takes to emit a signal to a certain
number of receivers does not exceed a certain
time.

other/ currently seems to be a sensible place for
such a test. Alternatively, it could have been put
next to corelib/kernel/qobject/.

Change-Id: I5c9461b62984f5806d1f6940123d30ef9f9f5a37
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/auto/auto.pro                                       | 2 +-
 tests/auto/network.pro                                    | 8 --------
 tests/auto/other/other.pro                                | 1 +
 tests/auto/{ => other}/qobjectperformance/.gitignore      | 0
 .../{ => other}/qobjectperformance/qobjectperformance.pro | 0
 .../qobjectperformance/tst_qobjectperformance.cpp         | 0
 6 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 tests/auto/network.pro
 rename tests/auto/{ => other}/qobjectperformance/.gitignore (100%)
 rename tests/auto/{ => other}/qobjectperformance/qobjectperformance.pro (100%)
 rename tests/auto/{ => other}/qobjectperformance/tst_qobjectperformance.cpp (100%)

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index e9d3bfd167f..4b22604dea9 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 d4d07fa4269..00000000000
--- 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 0224bb416ce..fe36713117c 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
similarity index 100%
rename from tests/auto/qobjectperformance/.gitignore
rename to tests/auto/other/qobjectperformance/.gitignore
diff --git a/tests/auto/qobjectperformance/qobjectperformance.pro b/tests/auto/other/qobjectperformance/qobjectperformance.pro
similarity index 100%
rename from tests/auto/qobjectperformance/qobjectperformance.pro
rename to tests/auto/other/qobjectperformance/qobjectperformance.pro
diff --git a/tests/auto/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp
similarity index 100%
rename from tests/auto/qobjectperformance/tst_qobjectperformance.cpp
rename to tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp