Unify the interface for QQmlDebugServices

Let the debug server handle adding and removing of engines through
defined interfaces to prepare for multi-engine profiling and debugging.

Change-Id: I7b277e54bdcce1d3e95e723f041a7db6b08b29fc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 0766fcb7b1..0529e41007 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -62,6 +62,7 @@
 #include "qqmllist_p.h"
 #include "qqmltypenamecache_p.h"
 #include "qqmlnotifier_p.h"
+#include <private/qqmldebugserver_p.h>
 #include <private/qqmlprofilerservice_p.h>
 #include <private/qv4debugservice_p.h>
 #include <private/qdebugmessageservice_p.h>
@@ -813,11 +814,12 @@ void QQmlEnginePrivate::init()
     if (QCoreApplication::instance()->thread() == q->thread() &&
         QQmlEngineDebugService::isDebuggingEnabled()) {
         isDebugging = true;
-        QQmlEngineDebugService::instance()->addEngine(q);
-        QV4DebugService::instance()->addEngine(q);
-        QV4ProfilerService::initialize();
+        QQmlEngineDebugService::instance();
+        QV4DebugService::instance();
+        QV4ProfilerService::instance();
         QQmlProfilerService::instance();
         QDebugMessageService::instance();
+        QQmlDebugServer::instance()->addEngine(q);
     }
 }
 
@@ -895,10 +897,8 @@ QQmlEngine::QQmlEngine(QQmlEnginePrivate &dd, QObject *parent)
 QQmlEngine::~QQmlEngine()
 {
     Q_D(QQmlEngine);
-    if (d->isDebugging) {
-        QQmlEngineDebugService::instance()->remEngine(this);
-        QV4DebugService::instance()->removeEngine(this);
-    }
+    if (d->isDebugging)
+        QQmlDebugServer::instance()->removeEngine(this);
 
     // Emit onDestruction signals for the root context before
     // we destroy the contexts, engine, Singleton Types etc. that