Moved utf8/ and deleted corelib.pro

This change moves utf8/ into corelib, thus
allowing corelib.pro to be deleted.

Change-Id: Ib1b4e0930ac0e116d9bbc242a6dfb63ae5785d19
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 14ba4a9..a9047f0 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    corelib.pro \
+    corelib \
     dbus \
     host.pro \
     gui \

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
deleted file mode 100644 (file)
index 007779a..0000000
--- a/tests/auto/corelib.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-   corelib \
-   utf8

diff --git a/tests/auto/corelib/codecs/codecs.pro b/tests/auto/corelib/codecs/codecs.pro
index 41c5d8e..5cd2653 100644 (file)
--- a/tests/auto/corelib/codecs/codecs.pro
+++ b/tests/auto/corelib/codecs/codecs.pro
@@ -1,3 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   qtextcodec
+   qtextcodec \
+   utf8 \ # Integrate into qtextcodec test? See QTBUG-22590.

diff --git a/tests/auto/utf8/tst_utf8.cpp b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
similarity index 100%
rename from tests/auto/utf8/tst_utf8.cpp
rename to tests/auto/corelib/codecs/utf8/tst_utf8.cpp

diff --git a/tests/auto/utf8/utf8.pro b/tests/auto/corelib/codecs/utf8/utf8.pro
similarity index 100%
rename from tests/auto/utf8/utf8.pro
rename to tests/auto/corelib/codecs/utf8/utf8.pro