diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-06-04 13:52:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-12 18:45:12 +0200 |
| commit | 8fa348a0500719264ed07ca323f740645ebead9e (patch) | |
| tree | e6f26bfa08bb51cca5b17c07c11163dcb3565a04 /tests/auto | |
| parent | 27f1c69a0533160dbe66690f337a45080a035246 (diff) | |
Properly escape bytearray data outside the ascii range when using a codec
Some codecs can't handle the range outside ascii properly and would then
fail to read the data back in correctly.
Backport of change 7df8b1ada4b23acedda5724b492c26a8e322648b from Qt 5.
Task-number: QTBUG-15543
Change-Id: I4c02921e787a939eeec0c7a11603b5896d756aef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qsettings/tst_qsettings.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/auto/qsettings/tst_qsettings.cpp b/tests/auto/qsettings/tst_qsettings.cpp index 379d193338..86e1866cf0 100644 --- a/tests/auto/qsettings/tst_qsettings.cpp +++ b/tests/auto/qsettings/tst_qsettings.cpp @@ -185,6 +185,7 @@ private slots: void testByteArray_data(); void testByteArray(); + void iniCodec(); private: void oldWriteEntry_data(); @@ -718,6 +719,28 @@ void tst_QSettings::testByteArray() } } +void tst_QSettings::iniCodec() +{ + { + QSettings settings("QtProject", "tst_qsettings"); + settings.setIniCodec("cp1251"); + QByteArray ba; + ba.resize(256); + for (int i = 0; i < ba.size(); i++) + ba[i] = i; + settings.setValue("array",ba); + } + { + QSettings settings("QtProject", "tst_qsettings"); + settings.setIniCodec("cp1251"); + QByteArray ba = settings.value("array").toByteArray(); + QCOMPARE(ba.size(), 256); + for (int i = 0; i < ba.size(); i++) + QCOMPARE((uchar)ba.at(i), (uchar)i); + } + +} + void tst_QSettings::testErrorHandling_data() { QTest::addColumn<int>("filePerms"); // -1 means file should not exist |