diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-05 10:49:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 15:01:07 +0100 |
| commit | 3c9a2d3903e8718e6354f8bcfffe9d04f782ca06 (patch) | |
| tree | 9166de2505d8da0dc5ba8f7ca95277065405390b /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | a7269f0b343e0c0a1b0ec774c5abc57f347d5c77 (diff) | |
[new compiler] Fix designer integration
If the QML puppet disables onComplete callbacks, we must obey that also
in the new code path.
Change-Id: Ic9b74c6a5ee04dc5b8e4f545a8e6cc0fa8dd28f1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index abca36c6aa..f8aadb3070 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1185,7 +1185,7 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru } } - if (true /* ### componentCompleteEnabled()*/) { // the qml designer does the component complete later + if (QQmlVME::componentCompleteEnabled()) { // the qml designer does the component complete later QQmlTrace trace("VME Component Complete"); while (!sharedState->allParserStatusCallbacks.isEmpty()) { Q_QML_VME_PROFILE(sharedState->profiler, pop()); @@ -1226,7 +1226,7 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru Q_ASSERT(d); Q_ASSERT(d->context); a->add(&d->context->componentAttached); - // ### designer if (componentCompleteEnabled()) + if (QQmlVME::componentCompleteEnabled()) emit a->completed(); if (watcher.hasRecursed() || interrupt.shouldInterrupt()) |