History

Merge pull request #2852 from huffman/19614

Code Review for Job #19614

Brad Hefta-Gaub committed 12 years ago

Commit 8bb5b902 parents f03e9f8 a5c10226 files · +632 −0Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+4−0
@@ -35,6 +35,7 @@ · 34 unmodified lines
35#include "MenuItemProperties.h"35#include "MenuItemProperties.h"
36#include "LocalVoxels.h"36#include "LocalVoxels.h"
37#include "ScriptEngine.h"37#include "ScriptEngine.h"
38#include "XMLHttpRequestClass.h"
38 39
39VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;40VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
40ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface;41ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface;
@@ -229,6 +230,9 @@ void ScriptEngine::init() { · 188 unmodified lines
229 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);230 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
230 qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);231 qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);
231 232
233 QScriptValue xmlHttpRequestConstructorValue = _engine.newFunction(XMLHttpRequestClass::constructor);
234 _engine.globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
235
232 QScriptValue printConstructorValue = _engine.newFunction(debugPrint);236 QScriptValue printConstructorValue = _engine.newFunction(debugPrint);
233 _engine.globalObject().setProperty("print", printConstructorValue);237 _engine.globalObject().setProperty("print", printConstructorValue);
234 238