diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:02:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:02:54 +0200 |
| commit | a96214e1d0bdf5930194b8451975775fecf20f0d (patch) | |
| tree | 7ebbfa60029b86529e0f30f1ed519d145f34f86f | |
| parent | 7c15a3bc25cdde1c4fe131b06e8c942afa7edf04 (diff) | |
| parent | da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I5c3215469c4b5f45943e8937e8b1eb309c6aed92
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index bc044eeb2..6c7c5511f 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -492,7 +492,7 @@ ScrollView { y: listView.contentHeight - listView.contentY + listView.originY width: parent.width visible: alternatingRowColors - height: viewport.height - listView.contentHeight + height: listView.model && listView.model.count ? (viewport.height - listView.contentHeight) : 0 Repeater { model: visible ? parent.paddedRowCount : 0 Loader { |