diff options
| -rw-r--r-- | src/controls/ScrollView.qml | 2 | ||||
| -rw-r--r-- | src/private/ScrollViewHelper.qml | 4 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_scrollview.qml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 9c69bc18..320cb823 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -146,7 +146,7 @@ FocusScope { internal.flickableItem = contentItem // "Use content if it is a flickable } else { internal.flickableItem = flickableComponent.createObject(this) - contentItem.parent = flickableItem.contentItem + contentItem.parent = internal.flickableItem } internal.flickableItem.parent = viewportItem internal.flickableItem.anchors.fill = viewportItem diff --git a/src/private/ScrollViewHelper.qml b/src/private/ScrollViewHelper.qml index 0eadfb13..1759edda 100644 --- a/src/private/ScrollViewHelper.qml +++ b/src/private/ScrollViewHelper.qml @@ -69,8 +69,8 @@ Item { recursionGuard = true wheelarea.availableWidth = viewport.width wheelarea.availableHeight = viewport.height - wheelarea.contentWidth = flickableItem.contentWidth - wheelarea.contentHeight = flickableItem.contentHeight + wheelarea.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 + wheelarea.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 recursionGuard = false } } diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 1d8651ed..05519f6e 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -66,7 +66,7 @@ TestCase { scrollView.contentItem = bigItem scrollView.visible = true - verify(scrollView.flickableItem, "flickableItem should not be null") + verify(scrollView.flickableItem !== null, "flickableItem should not be null") verify(scrollView.flickableItem !== scrollView.contentItem) verify(scrollView.flickableItem.contentHeight === 0, "ContentHeight not set") |