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
3535 #include "MenuItemProperties.h"
3636 #include "LocalVoxels.h"
3737 #include "ScriptEngine.h"
38+#include "XMLHttpRequestClass.h"
3839
3940 VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
4041 ParticlesScriptingInterface ScriptEngine::_particlesScriptingInterface;
@@ -229,6 +230,9 @@ void ScriptEngine::init() { · 188 unmodified lines
229230 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(&_engine);
230231 qScriptRegisterSequenceMetaType<QVector<QString> >(&_engine);
231232
233+ QScriptValue xmlHttpRequestConstructorValue = _engine.newFunction(XMLHttpRequestClass::constructor);
234+ _engine.globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
235+
232236 QScriptValue printConstructorValue = _engine.newFunction(debugPrint);
233237 _engine.globalObject().setProperty("print", printConstructorValue);
234238