History

Remove script -> qt::webchannel dependency

Brad Davis committed 10 years ago

Commit 05b7fcc1 parent 46a4a463 files · +2 −4Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 3 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
@@ -351,8 +350,6 @@ void ScriptEngine::init() { · 314 unmodified lines
351 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);350 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);
352 qScriptRegisterSequenceMetaType<QVector<QString> >(this);351 qScriptRegisterSequenceMetaType<QVector<QString> >(this);
353 352
354
355 registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
356 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);353 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);
357 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);354 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
358 355