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>

13 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/corelib/codecs/codecs.pro b/tests/auto/corelib/codecs/codecs.pro
new file mode 100644
index 0000000000..41c5d8e46d
--- /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
index a27a4d9153..a27a4d9153 100644
--- a/tests/auto/qtextcodec/.gitattributes
+++ b/tests/auto/corelib/codecs/qtextcodec/.gitattributes
diff --git a/tests/auto/qtextcodec/.gitignore b/tests/auto/corelib/codecs/qtextcodec/.gitignore
index bdbd16ad43..bdbd16ad43 100644
--- a/tests/auto/qtextcodec/.gitignore
+++ b/tests/auto/corelib/codecs/qtextcodec/.gitignore
diff --git a/tests/auto/qtextcodec/QT4-crashtest.txt b/tests/auto/corelib/codecs/qtextcodec/QT4-crashtest.txt
index d64a06e206..d64a06e206 100644
--- a/tests/auto/qtextcodec/QT4-crashtest.txt
+++ b/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
index bf791ffc61..bf791ffc61 100644
--- a/tests/auto/qtextcodec/echo/echo.pro
+++ b/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
index 774cab1a9b..774cab1a9b 100644
--- a/tests/auto/qtextcodec/echo/main.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/echo/main.cpp
diff --git a/tests/auto/qtextcodec/korean.txt b/tests/auto/corelib/codecs/qtextcodec/korean.txt
index 07e1b07f76..07e1b07f76 100644
--- a/tests/auto/qtextcodec/korean.txt
+++ b/tests/auto/corelib/codecs/qtextcodec/korean.txt
diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
index 6cb13a9e06..6cb13a9e06 100644
--- a/tests/auto/qtextcodec/qtextcodec.pro
+++ b/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
index 2188d2f22f..2188d2f22f 100644
--- a/tests/auto/qtextcodec/test/test.pro
+++ b/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
index 4813f90652..4813f90652 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
diff --git a/tests/auto/qtextcodec/utf8.txt b/tests/auto/corelib/codecs/qtextcodec/utf8.txt
index f5ab44c8f4..f5ab44c8f4 100644
--- a/tests/auto/qtextcodec/utf8.txt
+++ b/tests/auto/corelib/codecs/qtextcodec/utf8.txt
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index d9da997122..4c84fbbbcb 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 2e36ef5e85..aa8056ebaa 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -167,7 +167,6 @@ SUBDIRS=\
     qtablewidget \
     qtcpsocket \
     qtextblock \
-    qtextcodec \
     qtextcursor \
     qtextdocumentfragment \
     qtextdocumentlayout \