3 files changed, 19 insertions, 16 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index 607b03916e..7d0ed00757 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -608,9 +608,9 @@ void QQmlDebugServerPrivate::_q_changeServiceState(const QString &serviceName,
         service = plugins.value(serviceName);
     }
 
-    if (service && (service->d_func()->state != newState)) {
+    if (service && service->state() != newState) {
         service->stateAboutToBeChanged(newState);
-        service->d_func()->state = newState;
+        service->setState(newState);
         service->stateChanged(newState);
     }
 
@@ -707,7 +707,7 @@ bool QQmlDebugServer::addService(QQmlDebugService *service)
     QQmlDebugService::State newState = QQmlDebugService::Unavailable;
     if (d->clientPlugins.contains(service->name()))
         newState = QQmlDebugService::Enabled;
-    service->d_func()->state = newState;
+    service->setState(newState);
     return true;
 }
 
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index c70ea10175..59ff1db699 100644
--- a/src/qml/debugger/qqmldebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -103,6 +103,12 @@ QQmlDebugService::State QQmlDebugService::state() const
     return d->state;
 }
 
+void QQmlDebugService::setState(QQmlDebugService::State newState)
+{
+    Q_D(QQmlDebugService);
+    d->state = newState;
+}
+
 namespace {
 class ObjectReferenceHash : public QObject
 {
diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index f25bb48e05..e75ba547ce 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -70,6 +70,16 @@ public:
 
     enum State { NotConnected, Unavailable, Enabled };
     State state() const;
+    void setState(State newState);
+
+    virtual void stateAboutToBeChanged(State);
+    virtual void stateChanged(State);
+    virtual void messageReceived(const QByteArray &);
+
+    virtual void engineAboutToBeAdded(QQmlEngine *);
+    virtual void engineAboutToBeRemoved(QQmlEngine *);
+    virtual void engineAdded(QQmlEngine *);
+    virtual void engineRemoved(QQmlEngine *);
 
     void sendMessage(const QByteArray &);
     void sendMessages(const QList<QByteArray> &);
@@ -86,22 +96,9 @@ protected:
 
     State registerService();
 
-    virtual void stateAboutToBeChanged(State);
-    virtual void stateChanged(State);
-    virtual void messageReceived(const QByteArray &);
-
-    virtual void engineAboutToBeAdded(QQmlEngine *);
-    virtual void engineAboutToBeRemoved(QQmlEngine *);
-    virtual void engineAdded(QQmlEngine *);
-    virtual void engineRemoved(QQmlEngine *);
-
 signals:
     void attachedToEngine(QQmlEngine *);
     void detachedFromEngine(QQmlEngine *);
-
-private:
-    friend class QQmlDebugServer;
-    friend class QQmlDebugServerPrivate;
 };
 
 class Q_QML_PRIVATE_EXPORT QQmlDebugStream : public QDataStream