diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
| commit | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (patch) | |
| tree | 5d4045c65c51bd953dd6118bc6cc24f8c2c817bc /src/controls/Private/BasicTableView.qml | |
| parent | 1bc05eceb7823b38ddec1d8e874f371fb8b2045f (diff) | |
| parent | 59264fc24e3806a7e43379a2b8c610148f89cccb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
Diffstat (limited to 'src/controls/Private/BasicTableView.qml')
| -rw-r--r-- | src/controls/Private/BasicTableView.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml index bc044eeb2..48e6eadc3 100644 --- a/src/controls/Private/BasicTableView.qml +++ b/src/controls/Private/BasicTableView.qml @@ -48,6 +48,7 @@ // We mean it. // +import QtQml 2.14 as Qml import QtQuick 2.6 import QtQuick.Controls 1.5 import QtQuick.Controls.Private 1.0 @@ -426,7 +427,7 @@ ScrollView { && !transientScrollBars && Qt.platform.os === "osx" ? __verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right : 0 - Binding { + Qml.Binding { // On Mac, we reserve the vSB space in the contentItem because the vSB should // appear under the header. Unfortunately, the ListView header won't expand // beyond the ListView's boundaries, that's why we need to ressort to this. @@ -434,6 +435,7 @@ ScrollView { when: Qt.platform.os === "osx" property: "verticalScrollbarOffset" value: 0 + restoreMode: Binding.RestoreBinding } function incrementCurrentIndexBlocking() { @@ -492,7 +494,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 { |