aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcomponent.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-04-03 11:50:05 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-03 07:50:17 +0200
commit817c0741d1d3e1dc1c505652ba764fe96b584aac (patch)
treefbd1519ae832cd6406525a8bfe624a37f426a012 /src/qml/qml/qqmlcomponent.cpp
parentb3264e2cb6a8fe87754aa1335ab9f8d5e3910c14 (diff)
Allow objects created in QML with incubateObject to be destroyed.
Change-Id: I8a0678ea8dff6f4a40ac367395a99dd025f7f08a Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 7bddaadcd0..2e46192246 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1396,7 +1396,8 @@ void QV8IncubatorResource::statusChanged(Status s)
{
if (s == Ready) {
Q_ASSERT(QQmlData::get(object()));
- QQmlData::get(object())->setImplicitDestructible();
+ QQmlData::get(object())->explicitIndestructibleSet = false;
+ QQmlData::get(object())->indestructible = false;
}
if (!me.IsEmpty()) { // Will be false in synchronous mode