History

Merge pull request #13720 from Atlante45/feat/test-tool

Stack tester changes

Stephen Birarda committed 8 years ago

Commit e686df62 parents e9f23a4 9c89aa916 files · +197 −141Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 16 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−0
@@ -74,6 +74,7 @@ · 73 unmodified lines
74#include "WebSocketClass.h"74#include "WebSocketClass.h"
75#include "RecordingScriptingInterface.h"75#include "RecordingScriptingInterface.h"
76#include "ScriptEngines.h"76#include "ScriptEngines.h"
77#include "StackTestScriptingInterface.h"
77#include "ModelScriptingInterface.h"78#include "ModelScriptingInterface.h"
78 79
79 80
@@ -762,6 +763,10 @@ void ScriptEngine::init() { · 682 unmodified lines
762 qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);763 qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
763 764
764 registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());765 registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
766
767#if DEV_BUILD || PR_BUILD
768 registerGlobalObject("StackTest", new StackTestScriptingInterface(this));
769#endif
765}770}
766 771
767void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {772void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {