summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-24 01:25:32 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-24 03:30:49 (GMT)
commit30275dfcb8c5303de201bc32fba2a6b9b26fa1cd (patch)
tree6e445f6b36b95bc1f2c53a93828044c3a6cfa026 /src
parent738c3a68e5ebe8051234ba17a15f2e0585f3d722 (diff)
downloadQt-30275dfcb8c5303de201bc32fba2a6b9b26fa1cd.zip
Qt-30275dfcb8c5303de201bc32fba2a6b9b26fa1cd.tar.gz
Qt-30275dfcb8c5303de201bc32fba2a6b9b26fa1cd.tar.bz2
Use setParent_NoEvent in Loader and benchmark Loader performance.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index c0d316f..544e9ec 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -41,8 +41,9 @@
#include "qdeclarativeloader_p_p.h"
-#include <qdeclarativeengine_p.h>
#include <qdeclarativeinfo.h>
+#include <qdeclarativeengine_p.h>
+#include <qdeclarativeglobal_p.h>
QT_BEGIN_NAMESPACE
@@ -302,7 +303,7 @@ void QDeclarativeLoaderPrivate::_q_sourceLoaded()
return;
}
if (obj) {
- ctxt->setParent(obj);
+ QDeclarative_setParent_noEvent(ctxt, obj);
item = qobject_cast<QGraphicsObject *>(obj);
if (item) {
if (QDeclarativeItem* qmlItem = qobject_cast<QDeclarativeItem *>(item)) {