History

Revert "Revert "Migrate QML based web views to Qt WebEngine""

This reverts commit 1f3adeb66622a0d527e4f4b2307330e60593728d.

Brad Davis committed 10 years ago

Commit 6098c4a1 parent baf2d5a24 files · +1102 −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
@@ -350,6 +351,8 @@ void ScriptEngine::init() { · 314 unmodified lines
350 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);351 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);
351 qScriptRegisterSequenceMetaType<QVector<QString> >(this);352 qScriptRegisterSequenceMetaType<QVector<QString> >(this);
352 353
354
355 registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor);
353 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);356 QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor);
354 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);357 globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue);
355 358