Move QmlConsole to Debugger

Now it is closer to its only user and possibly reusable for no-QML uses
there.  We also drop the QML/JS syntax checker. The application being
debugged can already tell us about syntax errors. There is no need to
duplicate that functionality.

Change-Id: I2ba151f9f4c854c6119ba5462c21be40bddcebf9
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index e516557056..f767cd31e1 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -38,11 +38,11 @@
 #include <debugger/stackhandler.h>
 #include <debugger/threaddata.h>
 #include <debugger/watchhandler.h>
+#include <debugger/console/console.h>
 
 #include <utils/qtcassert.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <qmljs/consolemanagerinterface.h>
 
 namespace Debugger {
 namespace Internal {
@@ -451,9 +451,7 @@ void QmlCppEngine::shutdownEngine()
 {
     EDEBUG("\nMASTER SHUTDOWN ENGINE");
     m_cppEngine->shutdownSlaveEngine();
-    QmlJS::ConsoleManagerInterface *consoleManager = QmlJS::ConsoleManagerInterface::instance();
-    if (consoleManager)
-        consoleManager->setScriptEvaluator(0);
+    debuggerConsole()->setScriptEvaluator(ScriptEvaluator());
 }
 
 void QmlCppEngine::quitDebugger()