diff options
| author | Aurindam Jana <[email protected]> | 2012-10-04 14:54:59 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2012-10-05 11:03:01 +0200 |
| commit | 9ac25a293252a1196dad29b493add514459777a6 (patch) | |
| tree | 12b2e4aa58a7f310d0596bd067f458356ad58dea /src/plugins/qmljstools/qmljstoolsplugin.cpp | |
| parent | 614bb33589aa1fade05cd1b6b32b3acc848f2fd8 (diff) | |
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 <[email protected]>
Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/qmljstools/qmljstoolsplugin.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljstoolsplugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index f24a36db5e8..8ef62aace6f 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -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)), |