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>
2011-11-07 13:45:12 +01:00 · 2011-11-07 13:45:12 +01:00 · b481e0d885
commit b481e0d885
parent dad925a1ce
5 changed files with 3 additions and 6 deletions
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@ -1,7 +1,7 @@
 TEMPLATE = subdirs

 SUBDIRS += \
-    corelib.pro \
+    corelib \
    dbus \
    host.pro \
    gui \
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@ -1,4 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-   corelib \
-   utf8
--- 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.
--- a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
+++ b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
--- a/tests/auto/corelib/codecs/utf8/utf8.pro
+++ b/tests/auto/corelib/codecs/utf8/utf8.pro