1 files changed, 65 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..10a627bb82 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -125,6 +125,7 @@ private slots:
     void clonePreservesResources();
     void clonePreservesUserStates();
     void clonePreservesIndentWidth();
+    void clonePreservesFormatsWhenEmpty();
     void blockCount();
     void defaultStyleSheet();
 
@@ -193,6 +194,8 @@ private slots:
     void fontTagFace();
 
     void clearUndoRedoStacks();
+    void mergeFontFamilies();
+
 private:
     void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
     void buildRegExpData();
@@ -1793,6 +1796,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");
 }
 
@@ -2342,6 +2351,32 @@ void tst_QTextDocument::clonePreservesIndentWidth()
     delete clone;
 }
 
+void tst_QTextDocument::clonePreservesFormatsWhenEmpty()
+{
+    QTextDocument document;
+    QTextCursor cursor(&document);
+
+    // Change a few char format attributes
+    QTextCharFormat charFormat;
+    charFormat.setFontPointSize(charFormat.fontPointSize() + 1);
+    charFormat.setFontWeight(charFormat.fontWeight() + 1);
+    cursor.setBlockCharFormat(charFormat);
+
+    // Change a few block format attributes
+    QTextBlockFormat blockFormat;
+    blockFormat.setAlignment(Qt::AlignRight); // The default is Qt::AlignLeft
+    blockFormat.setIndent(blockFormat.indent() + 1);
+    cursor.setBlockFormat(blockFormat);
+
+    auto clone = document.clone();
+    QTextCursor cloneCursor(clone);
+
+    QCOMPARE(cloneCursor.blockCharFormat().fontPointSize(), charFormat.fontPointSize());
+    QCOMPARE(cloneCursor.blockCharFormat().fontWeight(), charFormat.fontWeight());
+    QCOMPARE(cloneCursor.blockFormat().alignment(), blockFormat.alignment());
+    QCOMPARE(cloneCursor.blockFormat().indent(), blockFormat.indent());
+}
+
 void tst_QTextDocument::blockCount()
 {
     QCOMPARE(doc->blockCount(), 1);
@@ -3552,6 +3587,36 @@ void tst_QTextDocument::fontTagFace()
     }
 }
 
+void tst_QTextDocument::mergeFontFamilies()
+{
+    QTextDocument td;
+    td.setHtml(QLatin1String(
+                   "<html><body>"
+                   "<span style=\" font-family:'MS Shell Dlg 2';\">Hello world</span>"
+                   "</body></html>"));
+
+    QTextCharFormat newFormat;
+    newFormat.setFontFamily(QLatin1String("Jokerman"));
+
+    QTextCursor cursor = QTextCursor(&td);
+    cursor.setPosition(0);
+    cursor.setPosition(QByteArray("Hello World").length(), QTextCursor::KeepAnchor);
+    cursor.mergeCharFormat(newFormat);
+
+    QVERIFY(td.toHtml().contains(QLatin1String("font-family:'MS Shell Dlg 2','Jokerman';")));
+
+    QTextCharFormat newFormatFamilies;
+    newFormatFamilies.setFontFamilies({ QLatin1String("Arial"), QLatin1String("Helvetica") });
+    cursor.mergeCharFormat(newFormatFamilies);
+
+    QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Arial','Helvetica','Jokerman'")));
+
+    newFormatFamilies.setFontFamilies({ QLatin1String("Arial"), QLatin1String("Jokerman"), QLatin1String("Helvetica") });
+    cursor.mergeCharFormat(newFormatFamilies);
+
+    QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Arial','Jokerman','Helvetica'")));
+}
+
 void tst_QTextDocument::clearUndoRedoStacks()
 {
     QTextDocument doc;