diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-03-11 19:36:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-11 19:45:23 +0100 |
| commit | b611ad6b3a51a383b67d44bc310e0ef4425eeda5 (patch) | |
| tree | 6a7b3e616c8fac441902f53ce4c2e9a3193dc260 /src/controls/ScrollView.qml | |
| parent | 7273078447cf5bbc8d8f80a38a865d01c62026fb (diff) | |
| download | qtquickcontrols-b611ad6b3a51a383b67d44bc310e0ef4425eeda5.tar.gz | |
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>
Diffstat (limited to 'src/controls/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 320cb823..38d580d2 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 |