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, 5 insertions, 2 deletions

diff --git a/src/qml/debugger/qdebugmessageservice.cpp b/src/qml/debugger/qdebugmessageservice.cpp
index 3e5cec54b1..6b0f184951 100644
--- a/src/qml/debugger/qdebugmessageservice.cpp
+++ b/src/qml/debugger/qdebugmessageservice.cpp
@@ -32,6 +32,7 @@
 ****************************************************************************/
 
 #include "qdebugmessageservice_p.h"
+#include <private/qqmldebugconnector_p.h>
 
 #include <QDataStream>
 
@@ -39,14 +40,16 @@ QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QDebugMessageService, qmlDebugMessageService)
 
+const QString QDebugMessageService::s_key = QStringLiteral("DebugMessages");
+
 void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
                          const QString &buf)
 {
-    QDebugMessageService::instance()->sendDebugMessage(type, ctxt, buf);
+    QQmlDebugConnector::service<QDebugMessageService>()->sendDebugMessage(type, ctxt, buf);
 }
 
 QDebugMessageService::QDebugMessageService(QObject *parent) :
-    QQmlDebugService(QStringLiteral("DebugMessages"), 2, parent), oldMsgHandler(0),
+    QQmlDebugService(s_key, 2, parent), oldMsgHandler(0),
     prevState(QQmlDebugService::NotConnected)
 {
     // don't execute stateChanged() in parallel