History

Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster

samcake committed 10 years ago

Commit 1e8e3fe2 parents 4e1a812 f55445b24 files · +1101 −334Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−0
@@ -30,6 +30,7 @@ · 29 unmodified lines
30#include <udt/PacketHeaders.h>30#include <udt/PacketHeaders.h>
31#include <UUID.h>31#include <UUID.h>
32 32
33#include <QmlWebWindowClass.h>
33#include <controllers/ScriptingInterface.h>34#include <controllers/ScriptingInterface.h>
34#include <AnimationObject.h>35#include <AnimationObject.h>
35 36
@@ -349,6 +350,8 @@ void ScriptEngine::init() { · 313 unmodified lines
349 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);350 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);
350 qScriptRegisterSequenceMetaType<QVector<QString> >(this);351 qScriptRegisterSequenceMetaType<QVector<QString> >(this);
351 352
353
354 registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
352 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);355 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);
353 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);356 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
354 357