Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-06 17:33:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1017 from vircadia/fix/pr-988-profiles

Browse source 
Fix profile errors in QML. (also add FIXME's)
This commit is contained in:
Kalila 2021-02-10 21:23:21 -05:00 committed by GitHub
commit c869554d46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
View file

@ -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

3
interface/resources/qml/controls/FlickableWebViewCore.qml
View file

@ -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

6
interface/resources/qml/controls/TabletWebScreen.qml
View file

@ -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

6
interface/resources/qml/controls/TabletWebView.qml
View file

@ -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

6
interface/resources/qml/controls/WebView.qml
View file

@ -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