From 4453bfcb20a781192870b37f668ebee72b91974e Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Tue, 16 Sep 2014 15:54:06 +0200
Subject: Restore -qt-block-indent on <li> elements

Task-number: QTBUG-20877
Change-Id: If049065ed99eaf8ffc85c8ff54d3da892a095795
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
 src/gui/text/qtextdocumentfragment.cpp                      |  2 +-
 .../qtextdocumentfragment/tst_qtextdocumentfragment.cpp     | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index 3bd1e2a801..896ba5c211 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -1142,7 +1142,7 @@ QTextHtmlImporter::ProcessNodeResult QTextHtmlImporter::processBlockNode()
         }
         if (hasBlock) {
             QTextBlockFormat fmt;
-            fmt.setIndent(0);
+            fmt.setIndent(currentNode->blockFormat.indent());
             cursor.mergeBlockFormat(fmt);
         }
     }
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 4274753c37..0664cd4e61 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -87,6 +87,7 @@ private slots:
     void html_listIndents4();
     void html_listIndents5();
     void html_listIndents6();
+    void html_listIndents7();
     void blockCharFormat();
     void blockCharFormatCopied();
     void initialBlock();
@@ -756,6 +757,18 @@ void tst_QTextDocumentFragment::html_listIndents6()
     QCOMPARE(cursor.blockFormat().indent(), 0);
 }
 
+void tst_QTextDocumentFragment::html_listIndents7()
+{
+    const char html[] = "<ul><li style=\"-qt-block-indent:1;\">Hey</ul>";
+    setHtml(QString::fromLatin1(html));
+    cursor.movePosition(QTextCursor::Start);
+    cursor.movePosition(QTextCursor::NextBlock);
+    QTextList *list = cursor.currentList();
+    QVERIFY(list);
+    QCOMPARE(list->format().indent(), 1);
+    QCOMPARE(cursor.block().blockFormat().indent(), 1);
+}
+
 void tst_QTextDocumentFragment::blockCharFormat()
 {
     const char html[] = "<p style=\"font-style:italic\"><span style=\"font-style:normal\">Test</span></p>";
-- 
cgit v1.2.3