aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlobjectcreator.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-12-18 10:37:22 +0100
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-01-09 10:46:03 +0100
commita7c183b1afbace47cd7bf7df46a8e689a01044de (patch)
tree7a418e683c979fae2d25c08c040d914ae0fe1c32 /src/qml/qml/qqmlobjectcreator.cpp
parentca977a0c8fa25d5df4dbddba08bc2fb022df7c1c (diff)
Remove QQmlTrace. We have a real profiler.
Change-Id: I50d981b277187327c2c63f8372f64db1300ed9ef Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
-rw-r--r--src/qml/qml/qqmlobjectcreator.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 883d9f7fda..f564cd235e 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -41,7 +41,6 @@
#include <private/qqmlbinding_p.h>
#include <private/qqmlstringconverters_p.h>
#include <private/qqmlboundsignal_p.h>
-#include <private/qqmltrace_p.h>
#include <private/qqmlcomponentattached_p.h>
#include <private/qqmlcomponent_p.h>
#include <private/qqmlcustomparser_p.h>
@@ -1200,10 +1199,6 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru
QQmlObjectCreatorRecursionWatcher watcher(this);
ActiveOCRestorer ocRestorer(this, QQmlEnginePrivate::get(engine));
- {
- QQmlTrace trace("VME Binding Enable");
- trace.event("begin binding eval");
-
while (!sharedState->allCreatedBindings.isEmpty()) {
QQmlAbstractBinding *b = sharedState->allCreatedBindings.pop();
if (!b)
@@ -1218,10 +1213,8 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru
if (watcher.hasRecursed() || interrupt.shouldInterrupt())
return 0;
}
- }
if (QQmlVME::componentCompleteEnabled()) { // the qml designer does the component complete later
- QQmlTrace trace("VME Component Complete");
while (!sharedState->allParserStatusCallbacks.isEmpty()) {
QQmlObjectCompletionProfiler profiler(&sharedState->profiler);
QQmlParserStatus *status = sharedState->allParserStatusCallbacks.pop();
@@ -1236,8 +1229,6 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru
}
}
- {
- QQmlTrace trace("VME Finalize Callbacks");
for (int ii = 0; ii < sharedState->finalizeCallbacks.count(); ++ii) {
QQmlEnginePrivate::FinalizeCallback callback = sharedState->finalizeCallbacks.at(ii);
QObject *obj = callback.first;
@@ -1249,10 +1240,7 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru
return 0;
}
sharedState->finalizeCallbacks.clear();
- }
- {
- QQmlTrace trace("VME Component.onCompleted Callbacks");
while (sharedState->componentAttached) {
QQmlComponentAttached *a = sharedState->componentAttached;
a->rem();
@@ -1266,7 +1254,6 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru
if (watcher.hasRecursed() || interrupt.shouldInterrupt())
return 0;
}
- }
phase = Done;