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
3030 #include <udt/PacketHeaders.h>
3131 #include <UUID.h>
3232
33−#include <QmlWebWindowClass.h>
3433 #include <controllers/ScriptingInterface.h>
3534 #include <AnimationObject.h>
3635
@@ -350,8 +349,6 @@ void ScriptEngine::init() { · 313 unmodified lines
350349 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);
351350 qScriptRegisterSequenceMetaType<QVector<QString> >(this);
352351
353−
354− registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
355352 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);
356353 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
357354