History

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

samcake committed 10 years ago

Commit 7e665152 parents 41525a7 baf2d5a24 files · +334 −1102Browse 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+0−3
@@ -30,7 +30,6 @@ · 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>
34#include <controllers/ScriptingInterface.h>33#include <controllers/ScriptingInterface.h>
35#include <AnimationObject.h>34#include <AnimationObject.h>
36 35
@@ -350,8 +349,6 @@ void ScriptEngine::init() { · 313 unmodified lines
350 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);349 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);
351 qScriptRegisterSequenceMetaType<QVector<QString> >(this);350 qScriptRegisterSequenceMetaType<QVector<QString> >(this);
352 351
353
354 registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
355 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);352 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);
356 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);353 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
357 354