Retrieve services from debug connector, not via static instance()

This will allow us to remove the instance() methods and create the
services from factories in plugins. Also, it allows us to remove the
isDebugging member from QQmlEnginePrivate.

Change-Id: Id9d9820a910902ecfdb1e8175e215093ce3d0965
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index 3c204bca8a..a2ba670608 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -63,6 +63,8 @@ public:
     virtual void signalEmitted(const QString &signal) = 0;
 
 protected:
+    friend class QQmlDebugConnector;
+
     QV4DebugService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
 
@@ -83,6 +85,8 @@ public:
     virtual void dataReady(QQmlAbstractProfilerAdapter *profiler) = 0;
 
 protected:
+    friend class QQmlDebugConnector;
+
     QQmlProfilerService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
 
@@ -97,6 +101,8 @@ public:
     virtual void setStatesDelegate(QQmlDebugStatesDelegate *) = 0;
 
 protected:
+    friend class QQmlDebugConnector;
+
     QQmlEngineDebugService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}
 
@@ -113,6 +119,8 @@ public:
     virtual void removeView(QObject *) = 0;
 
 protected:
+    friend class QQmlDebugConnector;
+
     QQmlInspectorService(float version, QObject *parent = 0) :
         QQmlDebugService(s_key, version, parent) {}