summaryrefslogtreecommitdiffstats
path: root/src/controls/ScrollView.qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-10-02 14:45:05 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-10-04 11:15:31 +0200
commit59264fc24e3806a7e43379a2b8c610148f89cccb (patch)
treefb8ea77d461c5c68a98b59b9bd4e152606795028 /src/controls/ScrollView.qml
parent6eac099fa98b6dbe5a01ad90e4a1348729b1332b (diff)
Make restoreMode on all Binding elements explicit
The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/controls/ScrollView.qml')
-rw-r--r--src/controls/ScrollView.qml7
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 {