diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /tests/auto/testlib | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'tests/auto/testlib')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_badxml.lightxml | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/expected_badxml.xml | 2 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/expected_badxml.xunitxml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/testlib/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml index e0de44f0be..94f479a79a 100644 --- a/tests/auto/testlib/selftests/expected_badxml.lightxml +++ b/tests/auto/testlib/selftests/expected_badxml.lightxml @@ -113,7 +113,7 @@ </TestFunction> <TestFunction name="encoding"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA["\u00DClrich \u00DCml\u00E4ut"]]></Description> + <Description><![CDATA["Ülrich Ümläut"]]></Description> </Message> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml index 8667c2d9cd..c1266bfeed 100644 --- a/tests/auto/testlib/selftests/expected_badxml.xml +++ b/tests/auto/testlib/selftests/expected_badxml.xml @@ -115,7 +115,7 @@ </TestFunction> <TestFunction name="encoding"> <Message type="qdebug" file="" line="0"> - <Description><![CDATA["\u00DClrich \u00DCml\u00E4ut"]]></Description> + <Description><![CDATA["Ülrich Ümläut"]]></Description> </Message> <Incident type="pass" file="" line="0" /> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.xunitxml index 46f4be4391..49048fdad6 100644 --- a/tests/auto/testlib/selftests/expected_badxml.xunitxml +++ b/tests/auto/testlib/selftests/expected_badxml.xunitxml @@ -30,7 +30,7 @@ <failure message="failure message" result="fail"/> </testcase> <testcase result="pass" name="encoding"> - <!-- message=""\u00DClrich \u00DCml\u00E4ut"" type="qdebug" --> + <!-- message=""Ülrich Ümläut"" type="qdebug" --> </testcase> <testcase result="pass" name="cleanupTestCase"/> <system-err> @@ -46,6 +46,6 @@ <![CDATA[quotes " text" more text]]> <![CDATA[xml close > open < tags < text]]> <![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]> -<![CDATA["\u00DClrich \u00DCml\u00E4ut"]]> +<![CDATA["Ülrich Ümläut"]]> </system-err> </testsuite> |