From 7b686abdd5bedcb32b5dbd19655df2e43f6242fd Mon Sep 17 00:00:00 2001
From: Holger Ihrig <holger.ihrig@nokia.com>
Date: Wed, 24 Aug 2011 10:30:49 +0200
Subject: [PATCH] Moving relevant tests to corelib/codecs

Task-number: QTBUG-21066

Change-Id: If33bda9622bbfdac2b72ec2bf8489b0f62bae6e2
Reviewed-on: http://codereview.qt.nokia.com/3469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/auto/corelib/codecs/codecs.pro                        |   3 +++
 tests/auto/{ => corelib/codecs}/qtextcodec/.gitattributes   |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/.gitignore       |   0
 .../auto/{ => corelib/codecs}/qtextcodec/QT4-crashtest.txt  | Bin
 tests/auto/{ => corelib/codecs}/qtextcodec/echo/echo.pro    |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/echo/main.cpp    |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/korean.txt       |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/qtextcodec.pro   |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/test/test.pro    |   0
 .../auto/{ => corelib/codecs}/qtextcodec/tst_qtextcodec.cpp |   0
 tests/auto/{ => corelib/codecs}/qtextcodec/utf8.txt         |   0
 tests/auto/corelib/corelib.pro                              |   3 ++-
 tests/auto/gui.pro                                          |   1 -
 13 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 tests/auto/corelib/codecs/codecs.pro
 rename tests/auto/{ => corelib/codecs}/qtextcodec/.gitattributes (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/.gitignore (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/QT4-crashtest.txt (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/echo/echo.pro (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/echo/main.cpp (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/korean.txt (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/qtextcodec.pro (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/test/test.pro (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/tst_qtextcodec.cpp (100%)
 rename tests/auto/{ => corelib/codecs}/qtextcodec/utf8.txt (100%)

diff --git a/tests/auto/corelib/codecs/codecs.pro b/tests/auto/corelib/codecs/codecs.pro
new file mode 100644
index 0000000..41c5d8e
--- /dev/null
+++ b/tests/auto/corelib/codecs/codecs.pro
@@ -0,0 +1,3 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qtextcodec
diff --git a/tests/auto/qtextcodec/.gitattributes b/tests/auto/corelib/codecs/qtextcodec/.gitattributes
similarity index 100%
rename from tests/auto/qtextcodec/.gitattributes
rename to tests/auto/corelib/codecs/qtextcodec/.gitattributes
diff --git a/tests/auto/qtextcodec/.gitignore b/tests/auto/corelib/codecs/qtextcodec/.gitignore
similarity index 100%
rename from tests/auto/qtextcodec/.gitignore
rename to tests/auto/corelib/codecs/qtextcodec/.gitignore
diff --git a/tests/auto/qtextcodec/QT4-crashtest.txt b/tests/auto/corelib/codecs/qtextcodec/QT4-crashtest.txt
similarity index 100%
rename from tests/auto/qtextcodec/QT4-crashtest.txt
rename to tests/auto/corelib/codecs/qtextcodec/QT4-crashtest.txt
diff --git a/tests/auto/qtextcodec/echo/echo.pro b/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro
similarity index 100%
rename from tests/auto/qtextcodec/echo/echo.pro
rename to tests/auto/corelib/codecs/qtextcodec/echo/echo.pro
diff --git a/tests/auto/qtextcodec/echo/main.cpp b/tests/auto/corelib/codecs/qtextcodec/echo/main.cpp
similarity index 100%
rename from tests/auto/qtextcodec/echo/main.cpp
rename to tests/auto/corelib/codecs/qtextcodec/echo/main.cpp
diff --git a/tests/auto/qtextcodec/korean.txt b/tests/auto/corelib/codecs/qtextcodec/korean.txt
similarity index 100%
rename from tests/auto/qtextcodec/korean.txt
rename to tests/auto/corelib/codecs/qtextcodec/korean.txt
diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
similarity index 100%
rename from tests/auto/qtextcodec/qtextcodec.pro
rename to tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/corelib/codecs/qtextcodec/test/test.pro
similarity index 100%
rename from tests/auto/qtextcodec/test/test.pro
rename to tests/auto/corelib/codecs/qtextcodec/test/test.pro
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
similarity index 100%
rename from tests/auto/qtextcodec/tst_qtextcodec.cpp
rename to tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
diff --git a/tests/auto/qtextcodec/utf8.txt b/tests/auto/corelib/codecs/qtextcodec/utf8.txt
similarity index 100%
rename from tests/auto/qtextcodec/utf8.txt
rename to tests/auto/corelib/codecs/qtextcodec/utf8.txt
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index d9da997..4c84fbb 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -1,3 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   animation
+   animation \
+   codecs
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 2e36ef5..aa8056e 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -167,7 +167,6 @@ SUBDIRS=\
     qtablewidget \
     qtcpsocket \
     qtextblock \
-    qtextcodec \
     qtextcursor \
     qtextdocumentfragment \
     qtextdocumentlayout \
-- 
2.7.4