Use QJSEngine instead of QQmlEngine in debug services

This allows us to use the debug infrastructure in a JavaScript-only
environment. Also add override declarations to make such changes
easier in the future.

Change-Id: I171271f0ad3868b3de71a8a2316a24602f94200a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

4 files changed, 17 insertions, 16 deletions

diff --git a/src/qml/debugger/qqmldebugconnector_p.h b/src/qml/debugger/qqmldebugconnector_p.h
index 499f0ece32..1e7d01e431 100644
--- a/src/qml/debugger/qqmldebugconnector_p.h
+++ b/src/qml/debugger/qqmldebugconnector_p.h
@@ -35,6 +35,7 @@
 #define QQMLDEBUGCONNECTOR_H
 
 #include <QtQml/qtqmlglobal.h>
+#include <QtQml/qjsengine.h>
 #include <QtCore/QVariantList>
 
 #include <private/qqmldebugservice_p.h>
@@ -69,8 +70,8 @@ public:
 
     virtual QQmlDebugService *service(const QString &name) const = 0;
 
-    virtual void addEngine(QQmlEngine *engine) = 0;
-    virtual void removeEngine(QQmlEngine *engine) = 0;
+    virtual void addEngine(QJSEngine *engine) = 0;
+    virtual void removeEngine(QJSEngine *engine) = 0;
 
     virtual bool addService(const QString &name, QQmlDebugService *service) = 0;
     virtual bool removeService(const QString &name) = 0;
diff --git a/src/qml/debugger/qqmldebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index bbcf67a54b..f46a924d5e 100644
--- a/src/qml/debugger/qqmldebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -182,21 +182,21 @@ void QQmlDebugService::messageReceived(const QByteArray &)
 {
 }
 
-void QQmlDebugService::engineAboutToBeAdded(QQmlEngine *engine)
+void QQmlDebugService::engineAboutToBeAdded(QJSEngine *engine)
 {
     emit attachedToEngine(engine);
 }
 
-void QQmlDebugService::engineAboutToBeRemoved(QQmlEngine *engine)
+void QQmlDebugService::engineAboutToBeRemoved(QJSEngine *engine)
 {
     emit detachedFromEngine(engine);
 }
 
-void QQmlDebugService::engineAdded(QQmlEngine *)
+void QQmlDebugService::engineAdded(QJSEngine *)
 {
 }
 
-void QQmlDebugService::engineRemoved(QQmlEngine *)
+void QQmlDebugService::engineRemoved(QJSEngine *)
 {
 }
 
diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index d95d7c4357..0fcf5459ef 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlEngine;
+class QJSEngine;
 
 class QQmlDebugServicePrivate;
 class Q_QML_PRIVATE_EXPORT QQmlDebugService : public QObject
@@ -75,10 +75,10 @@ public:
     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 *);
+    virtual void engineAboutToBeAdded(QJSEngine *);
+    virtual void engineAboutToBeRemoved(QJSEngine *);
+    virtual void engineAdded(QJSEngine *);
+    virtual void engineRemoved(QJSEngine *);
 
     static const QHash<int, QObject *> &objectsForIds();
     static int idForObject(QObject *);
@@ -88,8 +88,8 @@ protected:
     explicit QQmlDebugService(const QString &, float version, QObject *parent = 0);
 
 signals:
-    void attachedToEngine(QQmlEngine *);
-    void detachedFromEngine(QQmlEngine *);
+    void attachedToEngine(QJSEngine *);
+    void detachedFromEngine(QJSEngine *);
 
     void messageToClient(const QString &name, const QByteArray &message);
     void messagesToClient(const QString &name, const QList<QByteArray> &messages);
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index a2193b5c59..59712ee8ea 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -80,9 +80,9 @@ public:
     virtual void addGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0;
     virtual void removeGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0;
 
-    virtual void startProfiling(QQmlEngine *engine,
+    virtual void startProfiling(QJSEngine *engine,
                                 quint64 features = std::numeric_limits<quint64>::max()) = 0;
-    virtual void stopProfiling(QQmlEngine *engine) = 0;
+    virtual void stopProfiling(QJSEngine *engine) = 0;
 
     virtual void dataReady(QQmlAbstractProfilerAdapter *profiler) = 0;
 
@@ -99,7 +99,7 @@ class Q_QML_PRIVATE_EXPORT QQmlEngineDebugService : protected QQmlDebugService
 public:
     static const QString s_key;
 
-    virtual void objectCreated(QQmlEngine *engine, QObject *object) = 0;
+    virtual void objectCreated(QJSEngine *engine, QObject *object) = 0;
     virtual void setStatesDelegate(QQmlDebugStatesDelegate *) = 0;
 
 protected: