From b611ad6b3a51a383b67d44bc310e0ef4425eeda5 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Mon, 11 Mar 2013 19:36:11 +0100
Subject: [PATCH] Fix regression in ScrollView
The regression was introduced in
060a6afdf851ca4dbe05f19f3ad3cd486740fafa
The parent of our contentItem should really be the
flickables contentItem. Otherwise we don't scroll at all.
Change-Id: I75a9b68134bb2098f59436d23ff79ec600321963
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
src/controls/ScrollView.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 320cb823c..38d580d29 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 = internal.flickableItem
+ contentItem.parent = internal.flickableItem.contentItem
}
internal.flickableItem.parent = viewportItem
internal.flickableItem.anchors.fill = viewportItem
--
GitLab