diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml index 62226859b6..631036580e 100644 --- a/interface/resources/qml/Browser.qml +++ b/interface/resources/qml/Browser.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Controls 1.2 -import QtWebEngine 1.1 +import QtWebEngine 1.2 import "controls-uit" import "styles" as HifiStyles @@ -223,6 +223,9 @@ ScrollingWindow { var newWindow = component.createObject(desktop); request.openIn(newWindow.webView) } + onWindowCloseRequested: { + root.destroy(); + } Component.onCompleted: { desktop.initWebviewProfileHandlers(webview.profile) diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml index faf7f746a2..cefaf653fc 100644 --- a/interface/resources/qml/controls-uit/BaseWebView.qml +++ b/interface/resources/qml/controls-uit/BaseWebView.qml @@ -15,7 +15,7 @@ WebEngineView { id: root property var newUrl; - profile.httpUserAgent: "Mozilla/5.0 Chrome/38.0 (HighFidelityInterface)" + profile: desktop.browserProfile Component.onCompleted: { console.log("Connecting JS messaging to Hifi Logging") @@ -60,9 +60,4 @@ WebEngineView { } } } - - - // This breaks the webchannel used for passing messages. Fixed in Qt 5.6 - // See https://bugreports.qt.io/browse/QTBUG-49521 - //profile: desktop.browserProfile }