aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-10-05 18:15:03 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-06 07:55:45 +0200
commit6028d8ebceccc4edd7c31ba0d16773ae866336c3 (patch)
tree630de9c420b10b7f3b4146f2847962a878e915d4 /src
parent466fe00e80fe80c0babc7b895882926c0a34b785 (diff)
Always delete object if incubator is cancelled
Change-Id: Iad04340bac9d1345069e540e6bf9dbf671ce9226 Reviewed-on: http://codereview.qt-project.org/6088 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativeincubator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp
index ed75c9a1eb..4779caf214 100644
--- a/src/declarative/qml/qdeclarativeincubator.cpp
+++ b/src/declarative/qml/qdeclarativeincubator.cpp
@@ -486,6 +486,8 @@ void QDeclarativeIncubator::clear()
if (s == Loading) {
Q_ASSERT(d->component);
enginePriv = QDeclarativeEnginePrivate::get(d->component->engine);
+ delete d->result;
+ d->result = 0;
}
d->clear();