From e115fca4af33bee94c5d524e5d7776b1fa6a31a7 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Tue, 14 Jul 2015 15:32:33 +0200
Subject: 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>
---
 src/qml/qml/qqmlboundsignal.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 9577e107ab..3d1a9f8a88 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -43,8 +43,8 @@
 #include "qqmlcontext.h"
 #include "qqmlglobal_p.h"
 #include <private/qqmlprofiler_p.h>
-#include <private/qv4debugservice_p.h>
 #include <private/qqmldebugconnector_p.h>
+#include <private/qqmldebugserviceinterfaces_p.h>
 #include <private/qqmlcompiler_p.h>
 #include "qqmlinfo.h"
 
@@ -320,8 +320,11 @@ void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a)
     if (!s->m_expression)
         return;
 
-    if (QQmlDebugConnector::instance())
-        QV4DebugServiceImpl::instance()->signalEmitted(QString::fromLatin1(QMetaObjectPrivate::signal(s->m_expression->target()->metaObject(), s->signalIndex()).methodSignature()));
+    QV4DebugService *service = QQmlDebugConnector::service<QV4DebugService>();
+    if (service)
+        service->signalEmitted(QString::fromLatin1(QMetaObjectPrivate::signal(
+                                                       s->m_expression->target()->metaObject(),
+                                                       s->signalIndex()).methodSignature()));
 
     QQmlEngine *engine;
     if (s->m_expression && (engine = s->m_expression->engine())) {
-- 
cgit v1.2.3