v5.14.0-beta3

3 files changed, 16 insertions, 6 deletions

diff --git a/src/gui/text/qtextmarkdownwriter.cpp b/src/gui/text/qtextmarkdownwriter.cpp
index 764c64aead..c9a63920c3 100644
--- a/src/gui/text/qtextmarkdownwriter.cpp
+++ b/src/gui/text/qtextmarkdownwriter.cpp
@@ -173,7 +173,8 @@ void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
                 if (lastWasList)
                     m_stream << Newline;
             }
-            int endingCol = writeBlock(block, !table, table && tableRow == 0, nextIsDifferent);
+            int endingCol = writeBlock(block, !table, table && tableRow == 0,
+                                       nextIsDifferent && !block.textList());
             m_doubleNewlineWritten = false;
             if (table) {
                 QTextTableCell cell = table->cellAt(block.position());
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
index 1aa1406218..2f0b877799 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
@@ -171,14 +171,14 @@ void tst_QTextMarkdownImporter::lists_data()
     // Some of these cases show odd behavior, which is subject to change
     // as the importer and the writer are tweaked to fix bugs over time.
     QTest::newRow("dot newline") << ".\n" << 0 << true << ".\n\n";
-    QTest::newRow("number dot newline") << "1.\n" << 1 << true << "";
-    QTest::newRow("star newline") << "*\n" << 1 << true << "";
-    QTest::newRow("hyphen newline") << "-\n" << 1 << true << "";
-    QTest::newRow("hyphen space newline") << "- \n" << 1 << true << "";
+    QTest::newRow("number dot newline") << "1.\n" << 1 << true << "1.  \n";
+    QTest::newRow("star newline") << "*\n" << 1 << true << "* \n";
+    QTest::newRow("hyphen newline") << "-\n" << 1 << true << "- \n";
+    QTest::newRow("hyphen space newline") << "- \n" << 1 << true << "- \n";
     QTest::newRow("hyphen space letter newline") << "- a\n" << 1 << false << "- a\n";
     QTest::newRow("hyphen nbsp newline") <<
         QString::fromUtf8("-\u00A0\n") << 0 << true << "-\u00A0\n\n";
-    QTest::newRow("nested empty lists") << "*\n  *\n  *\n" << 1 << true << "";
+    QTest::newRow("nested empty lists") << "*\n  *\n  *\n" << 1 << true << "  * \n";
     QTest::newRow("list nested in empty list") << "-\n  * a\n" << 2 << false << "- \n  * a\n";
     QTest::newRow("lists nested in empty lists")
             << "-\n  * a\n  * b\n- c\n  *\n    + d\n" << 5 << false
diff --git a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
index 1e6c354f17..d15e856a20 100644
--- a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp
@@ -50,6 +50,7 @@ private slots:
     void testWriteParagraph_data();
     void testWriteParagraph();
     void testWriteList();
+    void testWriteEmptyList();
     void testWriteNestedBulletLists_data();
     void testWriteNestedBulletLists();
     void testWriteNestedNumericLists();
@@ -124,6 +125,14 @@ void tst_QTextMarkdownWriter::testWriteList()
         "- ListItem 1\n- ListItem 2\n"));
 }
 
+void tst_QTextMarkdownWriter::testWriteEmptyList()
+{
+    QTextCursor cursor(document);
+    cursor.createList(QTextListFormat::ListDisc);
+
+    QCOMPARE(documentToUnixMarkdown(), QString::fromLatin1("- \n"));
+}
+
 void tst_QTextMarkdownWriter::testWriteNestedBulletLists_data()
 {
     QTest::addColumn<bool>("checkbox");