diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-25 12:22:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-25 13:02:59 +0100 |
| commit | a8840ec4c3d5b1d2d641276c5c1ce2e582d6e2c7 (patch) | |
| tree | c49f784608b1d7c8abae241ebe2c831d13b7d8cb /src/controls/ScrollView.qml | |
| parent | 1d6b43c44b68d1983a77a7368c6cfff78f2d4cd0 (diff) | |
| download | qtquickcontrols-a8840ec4c3d5b1d2d641276c5c1ce2e582d6e2c7.tar.gz | |
ScrollView: Improve "Crash on exit" patch
This saves a parent change when creating the flickable item.
Partially amends f36f562a0e58f4ea37.
Change-Id: I2f76ea329c86e8754712b97cd87e41f56c791183
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index b0722e0f..c681901d 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -146,11 +146,11 @@ FocusScope { if (contentItem.hasOwnProperty("contentY") && // Check if flickable contentItem.hasOwnProperty("contentHeight")) { internal.flickableItem = contentItem // "Use content if it is a flickable + internal.flickableItem.parent = viewportItem } else { - internal.flickableItem = flickableComponent.createObject(internal) + internal.flickableItem = flickableComponent.createObject(viewportItem) contentItem.parent = internal.flickableItem.contentItem } - internal.flickableItem.parent = viewportItem internal.flickableItem.anchors.fill = viewportItem } |