History

Moving running scripts functionality to scripting library

Brad Davis committed 10 years ago

Commit d28f80a1 parent ddd9b0820 files · +664 −569Browse files

Showing the changes to interface/src/ui/JSConsole.cpp (1 of 20 files). Show all

Unified · Split

interface/src/ui/JSConsole.cpp+2−1
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 #include <QScrollBar>
1616 #include <QtConcurrent/QtConcurrentRun>
1717
18+#include <ScriptEngines.h>
1819 #include <PathUtils.h>
1920
2021 #include "Application.h"
@@ -84,7 +85,7 @@ void JSConsole::setScriptEngine(ScriptEngine* scriptEngine) { · 63 unmodified lines
8485
8586 // if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine
8687 _ownScriptEngine = scriptEngine == NULL;
87− _scriptEngine = _ownScriptEngine ? qApp->loadScript(QString(), false) : scriptEngine;
88+ _scriptEngine = _ownScriptEngine ? DependencyManager::get<ScriptEngines>()->loadScript(QString(), false) : scriptEngine;
8889
8990 connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(handlePrint(const QString&)));
9091 connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(handleError(const QString&)));

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t