From 65bef5d3d434b527f86fd9e843f041262209ce28 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 10 Feb 2021 06:52:29 -0500 Subject: [PATCH 1/2] Fix profile errors in QML. (also add FIXME's) --- interface/resources/qml/controls/TabletWebScreen.qml | 6 +++++- interface/resources/qml/controls/TabletWebView.qml | 6 +++++- interface/resources/qml/controls/WebView.qml | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml index 8aaafbd0fe..78292b8bcd 100644 --- a/interface/resources/qml/controls/TabletWebScreen.qml +++ b/interface/resources/qml/controls/TabletWebScreen.qml @@ -27,7 +27,11 @@ Item { } */ - property alias viewProfile: webroot.webViewCoreProfile + // FIXME - Reimplement profiles for... why? Was it so that new windows opened share the same profile? + // Are profiles written to by the webengine during the session? + // Removed in PR Feature/web entity user agent #988 + // + // property alias viewProfile: webroot.webViewCoreProfile FlickableWebViewCore { id: webroot diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml index 9cbbd48a22..0984f09141 100644 --- a/interface/resources/qml/controls/TabletWebView.qml +++ b/interface/resources/qml/controls/TabletWebView.qml @@ -25,7 +25,11 @@ Item { property bool isDesktop: false property alias url: web.url property alias webView: web.webViewCore - property alias profile: web.webViewCoreProfile + // FIXME - Reimplement profiles for... why? Was it so that new windows opened share the same profile? + // Are profiles written to by the webengine during the session? + // Removed in PR Feature/web entity user agent #988 + // + // property alias profile: web.webViewCoreProfile property bool remove: false property bool closeButtonVisible: true diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml index ebef5f85c5..a90824f3ad 100644 --- a/interface/resources/qml/controls/WebView.qml +++ b/interface/resources/qml/controls/WebView.qml @@ -38,6 +38,12 @@ Item { } */ + // FIXME - Reimplement profiles for... why? Was it so that new windows opened share the same profile? + // Are profiles written to by the webengine during the session? + // Removed in PR Feature/web entity user agent #988 + // + // property alias viewProfile: webroot.webViewCoreProfile + FlickableWebViewCore { id: webroot width: parent.width From dfa9b55223c8fe0b9358ddbdd3994bcd037ce124 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Wed, 10 Feb 2021 16:19:53 -0500 Subject: [PATCH 2/2] Add back removed lines and add FIXME's. --- .../resources/qml/controls/+webengine/FlickableWebViewCore.qml | 3 +++ interface/resources/qml/controls/FlickableWebViewCore.qml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml index e7d4f645aa..931233622a 100644 --- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml +++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml @@ -13,6 +13,9 @@ Item { property alias url: webViewCore.url property alias canGoBack: webViewCore.canGoBack property alias webViewCore: webViewCore + // FIXME - This was commented out to allow for manual setting of the userAgent. + // + // property alias webViewCoreProfile: webViewCore.profile property string webViewCoreUserAgent property bool useBackground: webViewCore.useBackground diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml index 3e2e74b3d5..8fdaf5feb4 100644 --- a/interface/resources/qml/controls/FlickableWebViewCore.qml +++ b/interface/resources/qml/controls/FlickableWebViewCore.qml @@ -11,6 +11,9 @@ Item { property alias url: webViewCore.url property alias canGoBack: webViewCore.canGoBack property alias webViewCore: webViewCore + // FIXME - This was commented out to allow for manual setting of the userAgent. + // + // property alias webViewCoreProfile: webViewCore.profile property alias useBackground: webViewCore.useBackground property alias userAgent: webViewCore.userAgent