diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:52:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-14 22:17:32 +0100 |
| commit | 60300fda463ae0f31c1e66ca253a2a976a88ee20 (patch) | |
| tree | b2264433418280ccbb7ed173892456fce4fab43a /src/qml/qml/qqmlcomponent.cpp | |
| parent | db462cce86dba0be80239d4aaaea668ef173af3d (diff) | |
| parent | 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I9d87ed86e95b5901a86cc3aa65d7ac39b0b708c2
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 936313768a..50ed58e63d 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -47,8 +47,6 @@ #include "qqml.h" #include "qqmlengine.h" #include "qqmlbinding_p.h" -#include <private/qqmldebugconnector_p.h> -#include <private/qqmldebugserviceinterfaces_p.h> #include "qqmlincubator.h" #include "qqmlincubator_p.h" #include <private/qqmljavascriptexpression_p.h> @@ -876,15 +874,6 @@ QQmlComponentPrivate::beginCreate(QQmlContextData *context) depthIncreased = false; } - if (rv) { - if (QQmlEngineDebugService *service = - QQmlDebugConnector::service<QQmlEngineDebugService>()) { - if (!context->isInternal) - context->asQQmlContextPrivate()->instances.append(rv); - service->objectCreated(engine, rv); - } - } - return rv; } |