From 82c865af2c79be998c3d9c72abb6cfd87d3a9cdd Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Thu, 17 Dec 2015 12:20:38 -0800 Subject: [PATCH] Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine --- examples/tests/qmlWebTest.js | 2 +- interface/src/Application.cpp | 1 - libraries/script-engine/CMakeLists.txt | 2 +- libraries/script-engine/src/ScriptEngine.cpp | 3 +++ tests/ui/src/main.cpp | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/tests/qmlWebTest.js b/examples/tests/qmlWebTest.js index 250852abe7..f905e494dc 100644 --- a/examples/tests/qmlWebTest.js +++ b/examples/tests/qmlWebTest.js @@ -1,6 +1,6 @@ print("Launching web window"); -webWindow = new QmlWebWindow('Test Event Bridge', "file:///C:/Users/bdavis/Git/hifi/examples/html/qmlWebTest.html", 320, 240, false); +webWindow = new OverlayWebWindow('Test Event Bridge', "file:///C:/Users/bdavis/Git/hifi/examples/html/qmlWebTest.html", 320, 240, false); print("JS Side window: " + webWindow); print("JS Side bridge: " + webWindow.eventBridge); webWindow.eventBridge.webEventReceived.connect(function(data) { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f0d41f0426..8bff85688e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4155,7 +4155,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, LocationScriptingInterface::locationSetter); - scriptEngine->registerFunction("QmlWebWindow", QmlWebWindowClass::constructor); scriptEngine->registerFunction("WebWindow", WebWindowClass::constructor, 1); scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance()); diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt index 3796abd92a..c1131765f7 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -1,3 +1,3 @@ set(TARGET_NAME script-engine) setup_hifi_library(Gui Network Script WebSockets Widgets) -link_hifi_libraries(shared networking octree gpu procedural model model-networking recording avatars fbx entities controllers animation audio physics) +link_hifi_libraries(shared networking ui octree gpu procedural model model-networking recording avatars fbx entities controllers animation audio physics) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index ded3db11e9..5f39bee9fa 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -350,6 +351,8 @@ void ScriptEngine::init() { qScriptRegisterSequenceMetaType >(this); qScriptRegisterSequenceMetaType >(this); + + registerFunction("OverlayWebWindow", QmlWebWindowClass::constructor); QScriptValue xmlHttpRequestConstructorValue = newFunction(XMLHttpRequestClass::constructor); globalObject().setProperty("XMLHttpRequest", xmlHttpRequestConstructorValue); diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index 75397ad95f..00d1f2dc00 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -250,7 +250,7 @@ private: registerGlobalObject("Script", this); qScriptRegisterSequenceMetaType>(this); qScriptRegisterSequenceMetaType>(this); - globalObject().setProperty("QmlWebWindow", newFunction(QmlWebWindowClass::constructor)); + globalObject().setProperty("OverlayWebWindow", newFunction(QmlWebWindowClass::constructor)); QScriptValue printConstructorValue = newFunction(debugPrint); globalObject().setProperty("print", printConstructorValue); }