Showing the changes to interface/src/ui/JSConsole.cpp (1 of 20 files). Show all
Unified · Split
| @@ -15,6 +15,7 @@ · 14 unmodified lines | |||
| 15 | #include <QScrollBar> | 15 | #include <QScrollBar> |
| 16 | #include <QtConcurrent/QtConcurrentRun> | 16 | #include <QtConcurrent/QtConcurrentRun> |
| 17 | 17 | ||
| 18 | #include <ScriptEngines.h> | ||
| 18 | #include <PathUtils.h> | 19 | #include <PathUtils.h> |
| 19 | 20 | ||
| 20 | #include "Application.h" | 21 | #include "Application.h" |
| @@ -84,7 +85,7 @@ void JSConsole::setScriptEngine(ScriptEngine* scriptEngine) { · 63 unmodified lines | |||
| 84 | 85 | ||
| 85 | // if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine | 86 | // if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine |
| 86 | _ownScriptEngine = scriptEngine == NULL; | 87 | _ownScriptEngine = scriptEngine == NULL; |
| 87 | _scriptEngine = _ownScriptEngine ? qApp->loadScript(QString(), false) : scriptEngine; | 88 | _scriptEngine = _ownScriptEngine ? DependencyManager::get<ScriptEngines>()->loadScript(QString(), false) : scriptEngine; |
| 88 | 89 | ||
| 89 | connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&))); | 90 | connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&))); |
| 90 | connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&))); | 91 | connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&))); |