Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

2 files changed, 18 insertions, 0 deletions

diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp
index fc61923613..611cf00609 100644
--- a/src/plugins/help/textbrowserhelpviewer.cpp
+++ b/src/plugins/help/textbrowserhelpviewer.cpp
@@ -448,3 +448,19 @@ void TextBrowserHelpWidget::mouseReleaseEvent(QMouseEvent *e)
 
     QTextBrowser::mouseReleaseEvent(e);
 }
+
+void TextBrowserHelpWidget::setSource(const QUrl &name)
+{
+    QTextBrowser::setSource(name);
+
+    QTextCursor cursor(document());
+    while (!cursor.atEnd()) {
+        QTextBlockFormat fmt = cursor.blockFormat();
+        if (fmt.hasProperty(QTextFormat::LineHeightType) && fmt.lineHeightType() == QTextBlockFormat::FixedHeight) {
+           fmt.setProperty(QTextFormat::LineHeightType, QTextBlockFormat::MinimumHeight);
+           cursor.setBlockFormat(fmt);
+        }
+        if (!cursor.movePosition(QTextCursor::NextBlock))
+            break;
+    }
+}
diff --git a/src/plugins/help/textbrowserhelpviewer.h b/src/plugins/help/textbrowserhelpviewer.h
index fccf79a532..5640fe10ad 100644
--- a/src/plugins/help/textbrowserhelpviewer.h
+++ b/src/plugins/help/textbrowserhelpviewer.h
@@ -96,6 +96,8 @@ public:
     void scaleUp();
     void scaleDown();
 
+    void setSource(const QUrl &name);
+
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
     bool eventFilter(QObject *obj, QEvent *event);