History

Merge pull request #3031 from stojce/19755

Code Review for Job #19755

Brad Hefta-Gaub committed 12 years ago

Commit cee6f1b2 parents df27de3 591ab449 files · +220 −10Browse files

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

Unified · Split

interface/src/Application.cpp+2−0
@@ -73,6 +73,7 @@ · 72 unmodified lines
73#include "devices/TV3DManager.h"73#include "devices/TV3DManager.h"
74#include "renderer/ProgramObject.h"74#include "renderer/ProgramObject.h"
75 75
76#include "scripting/AccountScriptingInterface.h"
76#include "scripting/AudioDeviceScriptingInterface.h"77#include "scripting/AudioDeviceScriptingInterface.h"
77#include "scripting/ClipboardScriptingInterface.h"78#include "scripting/ClipboardScriptingInterface.h"
78#include "scripting/MenuScriptingInterface.h"79#include "scripting/MenuScriptingInterface.h"
@@ -3572,6 +3573,7 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 3493 unmodified lines
3572 scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());3573 scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());
3573 scriptEngine->registerGlobalObject("AnimationCache", &_animationCache);3574 scriptEngine->registerGlobalObject("AnimationCache", &_animationCache);
3574 scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector);3575 scriptEngine->registerGlobalObject("AudioReflector", &_audioReflector);
3576 scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance());
3575 3577
3576 QThread* workerThread = new QThread(this);3578 QThread* workerThread = new QThread(this);
3577 3579