aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/testtypes.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-03-31 09:58:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-31 12:03:57 +0200
commit790268130926f318c007b41439c9d60463666e34 (patch)
treead182dcf6fd0eaed4e48b32d1ade176f12a33bf7 /tests/auto/qml/qqmllanguage/testtypes.cpp
parentbd54c80e4b60f922bf29154e8c1131c274a603a8 (diff)
Fix performance regression of parent setting during QML object creation
This showed up in the profiles again: In QML we create a lot of objects with many children and sending a child event each time is expensive. That's why the VME didn't do that and hadn't done so in ages. This patch restores that behavior and aspect of loading performance. Change-Id: I5078fe330d913dc832b284aaecf031152dc80802 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/testtypes.cpp')
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp
index 8dd788869b..226206edfd 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.cpp
+++ b/tests/auto/qml/qqmllanguage/testtypes.cpp
@@ -205,3 +205,20 @@ void SimpleObjectCustomParser::setCustomData(QObject *object, const QByteArray &
o->setCustomBindingsCount(data.toInt(&ok));
Q_ASSERT(ok);
}
+
+
+MyQmlObject::MyQmlObject()
+ : m_value(-1)
+ , m_interface(0)
+ , m_qmlobject(0)
+ , m_childAddedEventCount(0)
+{
+ qRegisterMetaType<MyCustomVariantType>("MyCustomVariantType");
+}
+
+bool MyQmlObject::event(QEvent *event)
+{
+ if (event->type() == QEvent::ChildAdded)
+ m_childAddedEventCount++;
+ return QObject::event(event);
+}