Merge pull request #3238 from ctrlaltdavid/19824

Code Review for Job #19824

Brad Hefta-Gaub committed 12 years ago

Commit e9286e52 parents 211bed9 f3b4f703 files · +13 −4Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

@@ -3721,6 +3721,8 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 3720 unmodified lines
3721	3721
3722	3722	connect(scriptEngine, SIGNAL(finished(const QString&)), this, SLOT(scriptFinished(const QString&)));
3723	3723
	3724	+ connect(scriptEngine, SIGNAL(loadScript(const QString&)), this, SLOT(loadScript(const QString&)));
	3725	+
3724	3726	scriptEngine->registerGlobalObject("Overlays", &_overlays);
3725	3727
3726	3728	QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance());

Keyboard shortcuts