From a8840ec4c3d5b1d2d641276c5c1ce2e582d6e2c7 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Date: Mon, 25 Mar 2013 12:22:03 +0100
Subject: [PATCH] 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>
---
src/controls/ScrollView.qml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index b0722e0fd..c681901dd 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
}
--
GitLab