From 7d8e29534d2bf86cdad8a7a7c4c8b84c60daa42c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Tue, 14 Jul 2015 16:36:32 +0200
Subject: Extract minimal interface from QQmlDebugServer and use it.

This will allow us to move QQmlDebugServer into a plugin. The new QQmlDebugServer
is the interface exposed to connection plugins. The interface exposed to services
is renamed to QQmlDebugConnector, as technically it doesn't have to be a
"server".

Change-Id: Id508b8c0a6960228e889f45a437b73060392db39
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/qml/qqmlengine.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/qml/qml/qqmlengine.cpp')

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index ea9e257824..34015c17da 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -54,7 +54,7 @@
 #include "qqmllist_p.h"
 #include "qqmltypenamecache_p.h"
 #include "qqmlnotifier_p.h"
-#include <private/qqmldebugserver_p.h>
+#include <private/qqmldebugconnector_p.h>
 #include <private/qqmlprofilerservice_p.h>
 #include <private/qv4debugservice_p.h>
 #include <private/qdebugmessageservice_p.h>
@@ -861,14 +861,14 @@ void QQmlEnginePrivate::init()
 
     rootContext = new QQmlContext(q,true);
 
-    if (QCoreApplication::instance()->thread() == q->thread() && QQmlDebugServer::instance()) {
+    if (QCoreApplication::instance()->thread() == q->thread() && QQmlDebugConnector::instance()) {
         isDebugging = true;
         QQmlEngineDebugService::instance();
         QV4DebugService::instance();
         QQmlProfilerService::instance();
         QDebugMessageService::instance();
         QQmlEngineControlService::instance();
-        QQmlDebugServer::instance()->addEngine(q);
+        QQmlDebugConnector::instance()->addEngine(q);
     }
 }
 
@@ -946,7 +946,7 @@ QQmlEngine::~QQmlEngine()
 {
     Q_D(QQmlEngine);
     if (d->isDebugging)
-        QQmlDebugServer::instance()->removeEngine(this);
+        QQmlDebugConnector::instance()->removeEngine(this);
 
     d->typeLoader.invalidate();
 
-- 
cgit v1.2.3