diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-23 13:13:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-23 13:13:51 (GMT) |
| commit | 164728f711136356a6c3482f762321b01c9d82dd (patch) | |
| tree | ef76a64523ff99b1160eb7c8885a0d84c810f735 /tests | |
| parent | dfcaa6b67c1df879b08dd6952a7cfd60d93ff543 (diff) | |
| parent | 59bd3bcd961fb3198dc9ba24996f7f9af67aeda3 (diff) | |
| download | Qt-164728f711136356a6c3482f762321b01c9d82dd.zip Qt-164728f711136356a6c3482f762321b01c9d82dd.tar.gz Qt-164728f711136356a6c3482f762321b01c9d82dd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add a function that returns the D-Bus local machine ID
Add an SSE4.2 even simpler version of toLatin1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qstring/tst_qstring.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index c19b168..b26121c 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -3475,6 +3475,10 @@ void tst_QString::toLatin1Roundtrip_data() static const ushort unicode6[] = { 0x180, 0x1ff, 0x8001, 0x8080, 0xfffc }; QTest::newRow("non-latin1b") << QByteArray("?????") << QString::fromUtf16(unicode6, 5) << questionmarks; + + static const ushort unicode7[] = { 'H', 'e', 'l', 'l', 'o', 0x100, 0x17f, 0x180, 0x8080, 0xfffc }; + static const ushort unicode7q[] = { 'H', 'e', 'l', 'l', 'o', '?', '?', '?', '?', '?' }; + QTest::newRow("mixed") << QByteArray("Hello?????") << QString::fromUtf16(unicode7, 10) << QString::fromUtf16(unicode7q, 10); } void tst_QString::toLatin1Roundtrip() |