feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
This commit is contained in:
Eike Ziller
2016-04-15 10:07:49 +02:00
parent 0338f6909c 7080645d20
commit 8a77eacf8d
193 changed files with 966 additions and 1553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -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;
}
}