← Back to branch summary

~phablet-team/webbrowser-app/15.04

« back to all changes in this revision

Viewing changes to src/app/webcontainer/webapp-container.qml

  • Committer: CI Train Bot
  • Author(s): Alexandre Abreu
  • Date: 2015-04-10 13:33:10 UTC
  • mfrom: (955.3.2 remove-qtwebkit)
  • Revision ID: ci-train-bot@canonical.com-20150410133310-x2mbbmfuml090wqh
remove qtwebkit deps (LP: #1362640) Fixes: #1362640
Approved by: Timo Jyrinki, PS Jenkins bot, Olivier Tilloy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/webcontainer/webapp-container.qml
37
37
    property string webappName: ""
38
38
    property string webappModelSearchPath: ""
39
39
    property var webappUrlPatterns
40
 
    property bool oxide: false
41
40
    property string accountProvider: ""
42
41
    property string popupRedirectionUrlPrefixPattern: ""
43
42
    property url webviewOverrideFile: ""
82
81
            chromeVisible: root.chromeVisible
83
82
            backForwardButtonsVisible: root.backForwardButtonsVisible
84
83
            developerExtrasEnabled: root.developerExtrasEnabled
85
 
            oxide: root.oxide
86
84
            webappModelSearchPath: root.webappModelSearchPath
87
85
            webappUrlPatterns: root.webappUrlPatterns
88
86
            blockOpenExternalUrls: root.blockOpenExternalUrls
240
238
 
241
239
        // check if we are to display the login view
242
240
        // or directly switch to the webapp view
243
 
        if (accountProvider.length !== 0 && oxide) {
 
241
        if (accountProvider.length !== 0) {
244
242
            loadLoginView();
245
243
        } else {
246
244
            loadWebAppView();