From c9a5ccb268b5e2b2ce0743989c44f808b538ba9b Mon Sep 17 00:00:00 2001
From: Holger Ihrig <holger.ihrig@nokia.com>
Date: Fri, 26 Aug 2011 12:03:32 +0200
Subject: [PATCH] Moving relevant tests to corelib/statemachine

Task-number: QTBUG-21066

Change-Id: I6dfff1c3b3ad2119a588dc52eb5a2e67255284c1
Reviewed-on: http://codereview.qt.nokia.com/3658
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
---
 tests/auto/corelib.pro                                        | 1 -
 tests/auto/corelib/corelib.pro                                | 3 ++-
 tests/auto/{ => corelib/statemachine}/qstate/qstate.pro       | 0
 tests/auto/{ => corelib/statemachine}/qstate/tst_qstate.cpp   | 0
 .../statemachine}/qstatemachine/qstatemachine.pro             | 0
 .../statemachine}/qstatemachine/tst_qstatemachine.cpp         | 0
 tests/auto/corelib/statemachine/statemachine.pro              | 4 ++++
 tests/auto/gui.pro                                            | 1 -
 8 files changed, 6 insertions(+), 3 deletions(-)
 rename tests/auto/{ => corelib/statemachine}/qstate/qstate.pro (100%)
 rename tests/auto/{ => corelib/statemachine}/qstate/tst_qstate.cpp (100%)
 rename tests/auto/{ => corelib/statemachine}/qstatemachine/qstatemachine.pro (100%)
 rename tests/auto/{ => corelib/statemachine}/qstatemachine/tst_qstatemachine.cpp (100%)
 create mode 100644 tests/auto/corelib/statemachine/statemachine.pro

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 655a971193a..f3b78c6e853 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -40,7 +40,6 @@ SUBDIRS=\
    qsignalspy \
    qsize \
    qsizef \
-   qstate \
    qstl \
    qstring \
    qstringbuilder1 \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 0d19a2cb047..03a7035af06 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -6,4 +6,5 @@ SUBDIRS=\
    global \
    io \
    kernel \
-   plugin
+   plugin \
+   statemachine
diff --git a/tests/auto/qstate/qstate.pro b/tests/auto/corelib/statemachine/qstate/qstate.pro
similarity index 100%
rename from tests/auto/qstate/qstate.pro
rename to tests/auto/corelib/statemachine/qstate/qstate.pro
diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
similarity index 100%
rename from tests/auto/qstate/tst_qstate.cpp
rename to tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
similarity index 100%
rename from tests/auto/qstatemachine/qstatemachine.pro
rename to tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
similarity index 100%
rename from tests/auto/qstatemachine/tst_qstatemachine.cpp
rename to tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
diff --git a/tests/auto/corelib/statemachine/statemachine.pro b/tests/auto/corelib/statemachine/statemachine.pro
new file mode 100644
index 00000000000..aa645ac9f4d
--- /dev/null
+++ b/tests/auto/corelib/statemachine/statemachine.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qstate \
+    qstatemachine
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index bb23fa234af..047f30fd383 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -111,7 +111,6 @@ SUBDIRS=\
     qstackedwidget \
     qstandarditem \
     qstandarditemmodel \
-    qstatemachine \
     qstatusbar \
     qstringlistmodel \
     qstyle \