forked from qt-creator/qt-creator
ScriptConsole: Move from Debugger to QmlJSTools
The console is now a part of qmljstools plugin. The console appears as an output pane. A dummy QScriptEngine evaluates expressions when a declarative debug session is not in progress. During a debug session, the expressions are evaluated by the debug services. Task-Number: QTCREATORBUG-7402 Change-Id: Ic2eeac44fb335c706be03b89f8672b0356efe984 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include "qmljscodestylesettingspage.h"
|
||||
#include "qmljstoolsconstants.h"
|
||||
#include "qmljstoolssettings.h"
|
||||
#include "qmlconsolemanager.h"
|
||||
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
|
||||
@@ -52,6 +53,7 @@
|
||||
#include <QSettings>
|
||||
#include <QMenu>
|
||||
|
||||
using namespace QmlJSTools;
|
||||
using namespace QmlJSTools::Internal;
|
||||
|
||||
enum { debug = 0 };
|
||||
@@ -68,6 +70,7 @@ QmlJSToolsPlugin::~QmlJSToolsPlugin()
|
||||
{
|
||||
m_instance = 0;
|
||||
m_modelManager = 0; // deleted automatically
|
||||
m_consoleManager = 0; // deleted automatically
|
||||
}
|
||||
|
||||
bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
|
||||
@@ -79,6 +82,8 @@ bool QmlJSToolsPlugin::initialize(const QStringList &arguments, QString *error)
|
||||
|
||||
// Objects
|
||||
m_modelManager = new ModelManager(this);
|
||||
m_consoleManager = new QmlConsoleManager(this);
|
||||
|
||||
// Core::VCSManager *vcsManager = core->vcsManager();
|
||||
// Core::DocumentManager *fileManager = core->fileManager();
|
||||
// connect(vcsManager, SIGNAL(repositoryChanged(QString)),
|
||||
|
||||
Reference in New Issue
Block a user