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/v8/qqmlbuiltinfunctions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/qml/qml/v8')

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 26dd104753..f2918bb232 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -42,7 +42,7 @@
 #include <QFileInfo>
 
 #include <private/qqmlprofilerservice_p.h>
-#include <private/qqmldebugserver_p.h>
+#include <private/qqmldebugconnector_p.h>
 #include <private/qqmlglobal_p.h>
 
 #include <private/qqmlplatform_p.h>
@@ -1448,7 +1448,7 @@ QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx)
     const QByteArray baSource = frame.source.toUtf8();
     const QByteArray baFunction = frame.function.toUtf8();
     QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData());
-    if (!QQmlDebugServer::instance()) {
+    if (!QQmlDebugConnector::instance()) {
         logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX.");
     } else {
         QQmlProfilerService::instance()->startProfiling(v4->qmlEngine());
@@ -1467,7 +1467,7 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx)
     const QByteArray baFunction = frame.function.toUtf8();
     QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData());
 
-    if (!QQmlDebugServer::instance()) {
+    if (!QQmlDebugConnector::instance()) {
         logger.warning("Ignoring console.profileEnd(): the debug service is disabled.");
     } else {
         QQmlProfilerService::instance()->stopProfiling(v4->qmlEngine());
-- 
cgit v1.2.3