diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmljstools/qmlconsolemanager.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljstools.pro | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/qmljstools/qmlconsolemanager.cpp b/src/plugins/qmljstools/qmlconsolemanager.cpp index 714192c3f8..34358714f7 100644 --- a/src/plugins/qmljstools/qmlconsolemanager.cpp +++ b/src/plugins/qmljstools/qmlconsolemanager.cpp @@ -35,7 +35,6 @@ #include <qmljs/iscriptevaluator.h> -#include <QScriptEngine> #include <QVariant> using namespace QmlJS; @@ -45,7 +44,6 @@ namespace QmlJSTools { class QmlConsoleManagerPrivate { public: - QScriptEngine *scriptEngine; Internal::QmlConsoleItemModel *qmlConsoleItemModel; Internal::QmlConsolePane *qmlConsolePane; QmlJS::IScriptEvaluator *scriptEvaluator; @@ -55,7 +53,6 @@ QmlConsoleManager::QmlConsoleManager(QObject *parent) : ConsoleManagerInterface(parent), d(new QmlConsoleManagerPrivate) { - d->scriptEngine = new QScriptEngine(this); d->qmlConsoleItemModel = new Internal::QmlConsoleItemModel(this); d->qmlConsoleItemModel->setHasEditableRow(true); d->qmlConsolePane = new Internal::QmlConsolePane(this); @@ -175,9 +172,9 @@ void QmlConsoleModel::evaluate(const QString &expression) QmlConsoleModel::qmlConsoleItemModel()->appendEditableRow(); manager->d->scriptEvaluator->evaluateScript(expression); } else { - QVariant result = manager->d->scriptEngine->evaluate(expression).toVariant(); ConsoleItem *root = manager->rootItem(); - ConsoleItem *item = constructLogItemTree(root, result); + ConsoleItem *item = constructLogItemTree( + root, QObject::tr("Can only evaluate during a QML debug session.")); if (item) { QmlConsoleModel::qmlConsoleItemModel()->appendEditableRow(); manager->printToConsolePane(item); diff --git a/src/plugins/qmljstools/qmljstools.pro b/src/plugins/qmljstools/qmljstools.pro index 32ba18ba18..adb49b237d 100644 --- a/src/plugins/qmljstools/qmljstools.pro +++ b/src/plugins/qmljstools/qmljstools.pro @@ -10,8 +10,6 @@ DEFINES += QMLJSTOOLS_LIBRARY DEFINES += QMLJSTOOLS_STATIC } -QT += script - HEADERS += \ $$PWD/qmljstoolsplugin.h \ $$PWD/qmljstoolsconstants.h \ |