From 4b29921e639423e87b09d9dc29915de4fde3d76d Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 18 Feb 2016 16:41:29 -0800 Subject: [PATCH 1/3] media! --- interface/resources/qml/controls/WebView.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml index c7ae322cba..6ff66d6192 100644 --- a/interface/resources/qml/controls/WebView.qml +++ b/interface/resources/qml/controls/WebView.qml @@ -11,6 +11,7 @@ WebEngineView { root.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) { console.log("Web Window JS message: " + sourceID + " " + lineNumber + " " + message); }); + } // FIXME hack to get the URL with the auth token included. Remove when we move to Qt 5.6 @@ -36,6 +37,10 @@ WebEngineView { } } + onFeaturePermissionRequested: { + grantFeaturePermission(securityOrigin, feature, true); + } + onLoadingChanged: { // Required to support clicking on "hifi://" links if (WebEngineView.LoadStartedStatus == loadRequest.status) { From d73728ae78bf36d3f9598319a1a1fb016b24b356 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 18 Feb 2016 16:58:34 -0800 Subject: [PATCH 2/3] add to browser --- interface/resources/qml/Browser.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml index 382acc237c..110011d2c0 100644 --- a/interface/resources/qml/Browser.qml +++ b/interface/resources/qml/Browser.qml @@ -129,6 +129,10 @@ Window { id: webviewProfile storageName: "qmlUserBrowser" } + + onFeaturePermissionRequested: { + grantFeaturePermission(securityOrigin, feature, true); + } } } // item From 56f8282607619d5a5125323d4a9b715b99547603 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Fri, 19 Feb 2016 13:54:31 -0800 Subject: [PATCH 3/3] dont need this code here --- interface/resources/qml/Browser.qml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml index 110011d2c0..382acc237c 100644 --- a/interface/resources/qml/Browser.qml +++ b/interface/resources/qml/Browser.qml @@ -129,10 +129,6 @@ Window { id: webviewProfile storageName: "qmlUserBrowser" } - - onFeaturePermissionRequested: { - grantFeaturePermission(securityOrigin, feature, true); - } } } // item