diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:47 +0200 |
| commit | 3b953346feba686dbd64d7612b9739abfe0538b0 (patch) | |
| tree | 3a5d80b85e2e5f451544c94e0cd998a5418aa6b7 /src/controls/ScrollView.qml | |
| parent | bb9c24fb6c6716d226f9f81df98ee8dda34eada8 (diff) | |
| parent | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia150cd4c2e446eca3e6fbc23d9ebdf4c4e2a7516
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 { |