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/ScrollView.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/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index b0df615ee..951fe65e4 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 @@ -224,18 +225,20 @@ FocusScope { property alias __control: root } - Binding { + Qml.Binding { target: flickableItem property: "contentHeight" when: contentItem !== flickableItem value: contentItem ? contentItem.height : 0 + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: flickableItem when: contentItem !== flickableItem property: "contentWidth" value: contentItem ? contentItem.width : 0 + restoreMode: Binding.RestoreBinding } Connections { |