From b481e0d8856666d22b1f1038e3bbb2b598ea9479 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Mon, 7 Nov 2011 13:45:12 +0100 Subject: [PATCH] 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 --- tests/auto/auto.pro | 2 +- tests/auto/corelib.pro | 4 ---- tests/auto/corelib/codecs/codecs.pro | 3 ++- tests/auto/{ => corelib/codecs}/utf8/tst_utf8.cpp | 0 tests/auto/{ => corelib/codecs}/utf8/utf8.pro | 0 5 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 tests/auto/corelib.pro rename tests/auto/{ => corelib/codecs}/utf8/tst_utf8.cpp (100%) rename tests/auto/{ => corelib/codecs}/utf8/utf8.pro (100%) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 14ba4a9e06..a9047f0050 100644 --- 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 index 007779a70b..0000000000 --- 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 41c5d8e46d..5cd26536b7 100644 --- 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