summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-09-26 10:30:32 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-09-26 10:39:38 +0200
commit7c15a3bc25cdde1c4fe131b06e8c942afa7edf04 (patch)
tree447ad695800f9a3f66873551f5a8caf9d380ccda
parent219b55faa4848a4967bb34e34d4326a854b12e2a (diff)
downloadqtquickcontrols-7c15a3bc25cdde1c4fe131b06e8c942afa7edf04.tar.gz
Guard against flickableItem being null when scrolling
Fixes error from qmlplugindump: ScrollViewHelper.qml:147: TypeError: Cannot read property 'originX' of null Change-Id: I1bef74acda8fb4e1850967c4d684ece7d458699b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/controls/Private/ScrollViewHelper.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 4f1d59f0..3f309bb0 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -143,7 +143,7 @@ Item {
}
}
onValueChanged: {
- if (!blockUpdates) {
+ if (flickableItem && !blockUpdates) {
flickableItem.contentX = value + flickableItem.originX
}
}