aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-10 14:08:11 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-17 18:42:17 +0000
commit5b091eb79b6853d0fde34b5dea89a84b7514a5ff (patch)
tree028ffc059c85a6a7f304e2b0f43f69aa01ae2701 /src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
parentd3c3f026d376f5d9663cf4258162bc504afc1b28 (diff)
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>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp')
-rw-r--r--src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
index 7f5529636c..e4054e100d 100644
--- a/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
+++ b/src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp
@@ -35,8 +35,8 @@
#include "qqmldebugpacket.h"
#include <private/qhooks_p.h>
-#include <qqmlengine.h>
+#include <QtQml/qjsengine.h>
#include <QtCore/qdebug.h>
#include <QtCore/qjsonarray.h>
#include <QtCore/qjsondocument.h>
@@ -223,7 +223,7 @@ QQmlDebugService *QQmlNativeDebugConnector::service(const QString &name) const
return 0;
}
-void QQmlNativeDebugConnector::addEngine(QQmlEngine *engine)
+void QQmlNativeDebugConnector::addEngine(QJSEngine *engine)
{
TRACE_PROTOCOL("Add engine to connector:" << engine);
foreach (QQmlDebugService *service, m_services)
@@ -235,7 +235,7 @@ void QQmlNativeDebugConnector::addEngine(QQmlEngine *engine)
service->engineAdded(engine);
}
-void QQmlNativeDebugConnector::removeEngine(QQmlEngine *engine)
+void QQmlNativeDebugConnector::removeEngine(QJSEngine *engine)
{
TRACE_PROTOCOL("Remove engine from connector:" << engine);
foreach (QQmlDebugService *service, m_services)