diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-07 13:45:12 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-08 09:22:50 +0100 |
| commit | b481e0d8856666d22b1f1038e3bbb2b598ea9479 (patch) | |
| tree | 94e3da2da5538898608b3644c12737c2243cbc3c /tests | |
| parent | dad925a1ce4d5c4c4497b1d13104839fc834e941 (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib.pro | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/codecs/codecs.pro | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/codecs/utf8/tst_utf8.cpp (renamed from tests/auto/utf8/tst_utf8.cpp) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/codecs/utf8/utf8.pro (renamed from tests/auto/utf8/utf8.pro) | 0 |
5 files changed, 3 insertions, 6 deletions
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 index 3031089ac4..3031089ac4 100644 --- a/tests/auto/utf8/tst_utf8.cpp +++ b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp diff --git a/tests/auto/utf8/utf8.pro b/tests/auto/corelib/codecs/utf8/utf8.pro index 2d200e82a4..2d200e82a4 100644 --- a/tests/auto/utf8/utf8.pro +++ b/tests/auto/corelib/codecs/utf8/utf8.pro |