Export the block's line-height settings to html

Task-number: QTBUG-28404

Change-Id: I87e03ecd981c302a5aefdadf7bcfd9729e37bd13
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 03602712cc..30e0f32547 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2531,6 +2531,29 @@ void QTextHtmlExporter::emitBlockAttributes(const QTextBlock &block)
         html += QLatin1Char(';');
     }
 
+    if (format.lineHeightType() != QTextBlockFormat::SingleHeight) {
+        switch (format.lineHeightType()) {
+            case QTextBlockFormat::ProportionalHeight:
+            case QTextBlockFormat::FixedHeight:
+                html += QLatin1String(" line-height:");
+                break;
+            case QTextBlockFormat::MinimumHeight:
+                html += QLatin1String(" min-height:");
+                break;
+            case QTextBlockFormat::LineDistanceHeight:
+                html += QLatin1String(" line-spacing:");
+                break;
+            case QTextBlockFormat::SingleHeight:
+            default:
+                break; // Should never reach here
+        }
+        html += QString::number(format.lineHeight());
+        if (format.lineHeightType() == QTextBlockFormat::ProportionalHeight)
+            html += QLatin1String("%;");
+        else
+            html += QLatin1String("px;");
+    }
+
     emitPageBreakPolicy(format.pageBreakPolicy());
 
     QTextCharFormat diff;