diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-18 22:15:26 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-18 22:15:26 +0300 |
| commit | 4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b (patch) | |
| tree | 0901ee74f51f40ed8b617318ca81c580894f0156 | |
| parent | d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b (diff) | |
| parent | 2cf4b3fdba3330420055010fa9c2199b5a9831ab (diff) | |
| download | qtquickcontrols-4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b.tar.gz | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: I5f83f5717ca13a8f8f282079170ab4c34804c3f4
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 909006ff..126ddb1c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.4 +MODULE_VERSION = 5.15.5 diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index cd6114a1..4f0f9a0e 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -491,7 +491,7 @@ ScrollView { y: listView.contentHeight - listView.contentY + listView.originY width: parent.width visible: alternatingRowColors - height: listView.model && listView.model.count ? (viewport.height - listView.contentHeight) : 0 + height: listView.model && listView.model.count ? Math.max(viewport.height - listView.contentHeight, 0) : 0 Repeater { model: visible ? parent.paddedRowCount : 0 Loader { |