diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml index c2bb19e328..763e6530fb 100644 --- a/interface/resources/qml/controls-uit/BaseWebView.qml +++ b/interface/resources/qml/controls-uit/BaseWebView.qml @@ -15,10 +15,7 @@ import HFWebEngineProfile 1.0 WebEngineView { id: root - profile: HFWebEngineProfile { - id: webviewProfile - storageName: "qmlWebEngine" - } + profile: desktop.browserProfile Component.onCompleted: { console.log("Connecting JS messaging to Hifi Logging") diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml index ea2f048c1f..b207087be0 100644 --- a/interface/resources/qml/desktop/Desktop.qml +++ b/interface/resources/qml/desktop/Desktop.qml @@ -33,7 +33,7 @@ FocusScope { } } - + onHeightChanged: d.handleSizeChanged(); onWidthChanged: d.handleSizeChanged(); diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml index dd474a3889..e0f8cee1f9 100644 --- a/interface/resources/qml/hifi/Desktop.qml +++ b/interface/resources/qml/hifi/Desktop.qml @@ -27,6 +27,11 @@ OriginalDesktop.Desktop { property alias toolWindow: toolWindow ToolWindow { id: toolWindow } + property var browserProfile: WebEngineProfile { + id: webviewProfile + storageName: "qmlWebEngine" + } + Action { text: "Open Browser" shortcut: "Ctrl+B" diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 41287746a0..c9eb1423a6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -123,11 +123,11 @@ #include "devices/Leapmotion.h" #include "DiscoverabilityManager.h" #include "GLCanvas.h" -#include "HFWebEngineProfile.h" #include "InterfaceActionFactory.h" #include "InterfaceLogging.h" #include "LODManager.h" #include "ModelPackager.h" +#include "networking/HFWebEngineProfile.h" #include "scripting/AccountScriptingInterface.h" #include "scripting/AssetMappingsScriptingInterface.h" #include "scripting/AudioDeviceScriptingInterface.h" diff --git a/interface/src/HFWebEngineProfile.cpp b/interface/src/networking/HFWebEngineProfile.cpp similarity index 96% rename from interface/src/HFWebEngineProfile.cpp rename to interface/src/networking/HFWebEngineProfile.cpp index 2e76ebfcf2..6b377fa900 100644 --- a/interface/src/HFWebEngineProfile.cpp +++ b/interface/src/networking/HFWebEngineProfile.cpp @@ -1,6 +1,6 @@ // // HFWebEngineProfile.cpp -// interface/src +// interface/src/networking // // Created by Stephen Birarda on 2016-10-17. // Copyright 2016 High Fidelity, Inc. diff --git a/interface/src/HFWebEngineProfile.h b/interface/src/networking/HFWebEngineProfile.h similarity index 95% rename from interface/src/HFWebEngineProfile.h rename to interface/src/networking/HFWebEngineProfile.h index 68d1fcc934..5c7655479e 100644 --- a/interface/src/HFWebEngineProfile.h +++ b/interface/src/networking/HFWebEngineProfile.h @@ -1,6 +1,6 @@ // // HFWebEngineProfile.h -// interface/src +// interface/src/networking // // Created by Stephen Birarda on 2016-10-17. // Copyright 2016 High Fidelity, Inc. diff --git a/interface/src/HFWebEngineRequestInterceptor.cpp b/interface/src/networking/HFWebEngineRequestInterceptor.cpp similarity index 97% rename from interface/src/HFWebEngineRequestInterceptor.cpp rename to interface/src/networking/HFWebEngineRequestInterceptor.cpp index 67ab1b3d02..9c3f0b232e 100644 --- a/interface/src/HFWebEngineRequestInterceptor.cpp +++ b/interface/src/networking/HFWebEngineRequestInterceptor.cpp @@ -1,6 +1,6 @@ // // HFWebEngineRequestInterceptor.cpp -// libraries/networking/src +// interface/src/networking // // Created by Stephen Birarda on 2016-10-14. // Copyright 2016 High Fidelity, Inc. diff --git a/interface/src/HFWebEngineRequestInterceptor.h b/interface/src/networking/HFWebEngineRequestInterceptor.h similarity index 96% rename from interface/src/HFWebEngineRequestInterceptor.h rename to interface/src/networking/HFWebEngineRequestInterceptor.h index 0b812243f4..a4c308426c 100644 --- a/interface/src/HFWebEngineRequestInterceptor.h +++ b/interface/src/networking/HFWebEngineRequestInterceptor.h @@ -1,6 +1,6 @@ // // HFWebEngineRequestInterceptor.h -// interface/src +// interface/src/networking // // Created by Stephen Birarda on 2016-10-14. // Copyright 2016 High Fidelity, Inc.