summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-27 08:40:55 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-27 08:41:33 +0100
commitd3814e51bb1c19aa868566aea5d4edd19d2e3944 (patch)
tree1d7606bd0cb1167cecc733141998a2d0cca918d7 /tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
parent719ad1db552319529bb5978fabbae1af9a06c240 (diff)
parent2260d680c935eae0e989beb2040a01040f66a5fa (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp')
-rw-r--r--tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 52e56feb5a..0e9f94ab2b 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -1793,6 +1793,12 @@ void tst_QTextDocument::toHtml()
QCOMPARE(output, expectedOutput);
QDomDocument document;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ QEXPECT_FAIL("charfmt-for-list-item",
+ "The attribute \"style\" is redefined in the generated HTML, which is not valid "
+ "according to XML standard. The new QDomDocument implementation follows the XML "
+ "standard.", Continue);
+#endif
QVERIFY2(document.setContent(output), "Output was not valid XML");
}