Fix Loader leak when loading a non-QGraphicsObject object.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 544e9ec..4301467 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -303,9 +303,9 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
             return;
         }
         if (obj) {
-            QDeclarative_setParent_noEvent(ctxt, obj);
             item = qobject_cast<QGraphicsObject *>(obj);
             if (item) {
+                QDeclarative_setParent_noEvent(ctxt, obj);
                 if (QDeclarativeItem* qmlItem = qobject_cast<QDeclarativeItem *>(item)) {
                     qmlItem->setParentItem(q);
                 } else {
@@ -314,6 +314,10 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
                 }
 //                item->setFocus(true);
                 initResize();
+            } else {
+                qmlInfo(q) << QDeclarativeLoader::tr("Loader does not support loading non-visual elements.");
+                delete obj;
+                delete ctxt;
             }
         } else {
             delete obj;