From 0bd3c6b059986e92ecca1c926afd123074187f49 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 7 Apr 2010 13:12:06 +1000
Subject: Make sure Loader doesn't leak when component has errors.

---
 src/declarative/graphicsitems/qdeclarativeloader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 2aab36f..409c228 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -276,9 +276,6 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
     Q_Q(QDeclarativeLoader);
 
     if (component) {
-        QDeclarativeContext *ctxt = new QDeclarativeContext(qmlContext(q));
-        ctxt->setContextObject(q);
-
         if (!component->errors().isEmpty()) {
             qWarning() << component->errors();
             emit q->sourceChanged();
@@ -287,6 +284,9 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
             return;
         }
 
+        QDeclarativeContext *ctxt = new QDeclarativeContext(qmlContext(q));
+        ctxt->setContextObject(q);
+
         QDeclarativeComponent *c = component;
         QObject *obj = component->create(ctxt);
         if (component != c) {
-- 
cgit v0.12