summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qsettings/qsettings.qrc
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-09-01 14:26:51 +0200
committerLars Knoll <lars.knoll@digia.com>2014-10-29 08:58:31 +0100
commit38c2e3d1049f494529cb9876bcd564ec20ba512c (patch)
treedaac8ed0a17d8c2b38ea20006cb48647ff75d98a /tests/auto/corelib/io/qsettings/qsettings.qrc
parentad1ec8b57dde6f5cbb7a4f66272794a067dc3917 (diff)
Properly detect UTF-8 BOM markers in ini files
If we detect a utf8 BOM mark at the beginning of the .ini file, skip the marker and set the iniCodec to utf8. Task-number: QTBUG-23381 Change-Id: I1b37fc4f1638a48e4f3ee71ab165e2989bc592f1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests/auto/corelib/io/qsettings/qsettings.qrc')
-rw-r--r--tests/auto/corelib/io/qsettings/qsettings.qrc17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/corelib/io/qsettings/qsettings.qrc b/tests/auto/corelib/io/qsettings/qsettings.qrc
index 587c22ebe3..c0be7e013f 100644
--- a/tests/auto/corelib/io/qsettings/qsettings.qrc
+++ b/tests/auto/corelib/io/qsettings/qsettings.qrc
@@ -1,9 +1,10 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
- <file>resourcefile.ini</file>
- <file>resourcefile2.ini</file>
- <file>resourcefile3.ini</file>
- <file>resourcefile4.ini</file>
- <file>resourcefile5.ini</file>
-</qresource>
+<RCC>
+ <qresource prefix="/">
+ <file>resourcefile.ini</file>
+ <file>resourcefile2.ini</file>
+ <file>resourcefile3.ini</file>
+ <file>resourcefile4.ini</file>
+ <file>resourcefile5.ini</file>
+ <file>bom.ini</file>
+ </qresource>
</RCC>