projects / profile / ivi / qtbase.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a27d5be) | patch
Remove usage of QtXml from rcc, add test
authorGiuseppe D'Angelo <dangelog@gmail.com>
Sun, 26 Feb 2012 21:04:57 +0000 (21:04 +0000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 8 Mar 2012 08:59:31 +0000 (09:59 +0100)
commit84984af0e11029716a5a601869964470dff2d0be
tree800c5589ab877016e900b118038f02f3e41ebe12tree | snapshot
parenta27d5be4dc48e3bd7dbb2a624b17821daa60aaf0commit | diff
Remove usage of QtXml from rcc, add test

Ported from QDom to QXmlStreamReader. This enables removal of QtXml
classes from bootstrap.

A new rcc test was added, copying the data from the
QResourceFileEngine test. The new test runs rcc to create binary
resources, dynamically loads them under various locales and checks
that they do contain the expected files.

Change-Id: I15d23dfda45de851a421156951ce2a60af4c1f7f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
46 files changed:
src/tools/rcc/rcc.cpp diff | blob | history
tests/auto/tools/rcc/.gitignore diff | blob | history
tests/auto/tools/rcc/data/binary/aliasdir/aliasdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/aliasdir/compressme.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/aliases.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/aliases.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.de.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.de_CH.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.ko.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.locale [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/allfeatures.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/blahblah.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/currentdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/currentdir2.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.de.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.de_CH.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.it.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.locale [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/locale.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/multiple.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/multiple.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/otherdir/otherdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/prefixes.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/prefixes.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/search_file.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/searchpath1/search_file.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/searchpath2/search_file.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/simple.expected [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/simple.qrc [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/subdir/subdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/test/german.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/test/test/test1.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/test/test/test2.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/test/testdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/binary/test/testdir2.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/data/images/images.bin.expected [moved from tests/auto/tools/rcc/data/images.bin.expected with 100% similarity] blob | history
tests/auto/tools/rcc/data/images/images.expected [moved from tests/auto/tools/rcc/data/images.expected with 100% similarity] blob | history
tests/auto/tools/rcc/data/images/images.qrc [moved from tests/auto/tools/rcc/data/images.qrc with 100% similarity] blob | history
tests/auto/tools/rcc/data/images/images/circle.png [moved from tests/auto/tools/rcc/data/images/circle.png with 100% similarity] blob | history
tests/auto/tools/rcc/data/images/images/square.png [moved from tests/auto/tools/rcc/data/images/square.png with 100% similarity] blob | history
tests/auto/tools/rcc/data/images/images/subdir/triangle.png [moved from tests/auto/tools/rcc/data/images/subdir/triangle.png with 100% similarity] blob | history
tests/auto/tools/rcc/data/parentdir.txt [new file with mode: 0644] blob
tests/auto/tools/rcc/rcc.pro diff | blob | history
tests/auto/tools/rcc/tst_rcc.cpp diff | blob | history
Domain: UI Framework / Uncategorized;