diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-24 09:49:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-24 12:04:52 +0200 |
| commit | c96426f19f8c244c0f5748f0009016f576db9616 (patch) | |
| tree | f6365344e8a24415e7a67694af2f0c043bb0dae6 /src/widgets/widgets/qplaintextedit.cpp | |
| parent | 2137cb7dc5c902ce71855901c83c4c9d87b1ce2d (diff) | |
| parent | c5a3e5edd9e63b18abf1838c86a27a662224b02c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/widgets/widgets/qplaintextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qplaintextedit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 3959cb6c3f..f1471cc6e4 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -997,7 +997,8 @@ void QPlainTextEditPrivate::_q_adjustScrollbars() } else { vmax = qMax(0, doc->lineCount() - 1); - vSliderLength = viewport->height() / q->fontMetrics().lineSpacing(); + int lineSpacing = q->fontMetrics().lineSpacing(); + vSliderLength = lineSpacing != 0 ? viewport->height() / lineSpacing : 0; } |