Merge lp:~osomon/webbrowser-app/qt-labs-settings into lp:webbrowser-app

[Olivier Tilloy]

Use Qt.labs.settings to read/write the browser settings. This adds qml-module-qt-labs-settings as a runtime dependency for webbrowser-app.

[lp:~osomon/webbrowser-app/qt-labs-settings]

937. By Olivier Tilloy on 2015-03-23

Merge the latest changes from trunk and resolve a conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1554/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1932/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/312
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/312
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1702/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1930
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1930/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19086

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1554/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1556/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/314
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19089

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1556/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1557/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1940
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/315
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/315
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1938
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1938/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19095

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1557/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/qt-labs-settings]

938. By Olivier Tilloy on 2015-03-24

Add a restoreDefaults() method to the settings object.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:938
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1559/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1945/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/317
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/317/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/317
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1714/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1943/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19101

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1559/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Looks good to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:938
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1560/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/318
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/318
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1946
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1946/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19105

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1560/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/qt-labs-settings]

939. By Olivier Tilloy on 2015-03-27

Merge the latest changes from trunk and resolve a conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:939
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1577/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/335
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/335
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1763
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2000
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2000/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19220

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1577/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/qt-labs-settings]

940. By Olivier Tilloy on 2015-03-27

Remove top-level properties for settings.
Instead, properties should be set on the Settings instance directly, and the Settings instance is meant to be shared between views.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1579/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2007
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/337
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/337/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/337
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2005
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2005/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19228

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1579/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1582/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/340
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2010
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19235

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1582/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'README'
--- README	2015-02-27 09:28:41 +0000
+++ README	2015-03-27 10:06:40 +0000
@@ -74,7 +74,7 @@
 webbrowser-app supports a limited set of custom settings, currently not exposed
 in the UI. The settings are persisted on disk in the following INI-like file:
 
-    $HOME/.config/webbrowser-app/settings.conf
+    $HOME/.config/webbrowser-app/webbrowser-app.conf
 
 The following keys are supported:
 
@@ -86,4 +86,11 @@
    the OpenSearch document description format
    (http://www.opensearch.org/Specifications/OpenSearch/1.1)
 
-If any of those keys are not specified, the default hardcoded value is used.
+ - 'allowOpenInBackgroundTab': whether to offer an option to open a link in a
+   new background tab in the contextual menu. Possible values are "true",
+   "false", and "default" (which resolves to true on desktop and false on
+   mobile).
+
+ - restoreSession: whether to restore the previous browsing session at startup
+   (defaults to true)
+

=== modified file 'debian/control'
--- debian/control	2015-03-23 07:49:08 +0000
+++ debian/control	2015-03-27 10:06:40 +0000
@@ -36,6 +36,7 @@
          fonts-liberation,
          liboxideqt-qmlplugin (>= 1.5),
          libqt5sql5-sqlite,
+         qml-module-qt-labs-settings,
          qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
          qml-module-qtquick-dialogs | qtdeclarative5-dialogs-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2015-03-02 12:21:27 +0000
+++ src/app/browserapplication.cpp	2015-03-27 10:06:40 +0000
@@ -128,6 +128,7 @@
     QStringList appIdParts =
         QString::fromUtf8(qgetenv("APP_ID")).split('_');
     QCoreApplication::setApplicationName(appIdParts.first());
+    QCoreApplication::setOrganizationDomain(QCoreApplication::applicationName());
     // Get also the the first two components of the app ID: <package>_<app>,
     // which is needed by Online Accounts.
     QString unversionedAppId = QStringList(appIdParts.mid(0, 2)).join('_');

=== modified file 'src/app/config.h.in'
--- src/app/config.h.in	2014-06-30 10:40:59 +0000
+++ src/app/config.h.in	2015-03-27 10:06:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -24,10 +24,8 @@
 #include <QtCore/QString>
 
 #define APP_ID "webbrowser-app"
-#define DEFAULT_HOMEPAGE "http://start.ubuntu.com"
 #define REMOTE_INSPECTOR_PORT 9221
 
-#define DEFAULT_SEARCH_ENGINE "google"
 #define DEFAULT_SEARCH_NAME "Google Search"
 #define DEFAULT_SEARCH_DESC "Use google.com to search the Web"
 #define DEFAULT_SEARCH_TEMPLATE "https://google.com/search?client=ubuntu&q={searchTerms}&ie=utf-8&oe=utf-8"

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-03-23 07:49:13 +0000
+++ src/app/webbrowser/Browser.qml	2015-03-27 10:06:40 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
+import Qt.labs.settings 1.0
 import com.canonical.Oxide 1.5 as Oxide
 import Ubuntu.Components 1.1
 import webbrowserapp.private 0.1
@@ -29,16 +30,12 @@
 BrowserView {
     id: browser
 
-    property bool restoreSession: true
-
     currentWebview: tabsModel.currentTab ? tabsModel.currentTab.webview : null
 
     property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
     property var bookmarksModel: (bookmarksModelLoader.status == Loader.Ready) ? bookmarksModelLoader.item : null
 
-    property url homepage
-    property string searchEngine
-    property string allowOpenInBackgroundTab
+    property bool newSession: false
 
     // XXX: we might want to tweak this value depending
     // on the form factor and/or the available memory
@@ -78,6 +75,31 @@
         }
     ]
 
+    Settings {
+        id: settings
+
+        property url homepage: settingsDefaults.homepage
+        property string searchEngine: settingsDefaults.searchEngine
+        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
+        property bool restoreSession: settingsDefaults.restoreSession
+
+        function restoreDefaults() {
+            homepage  = settingsDefaults.homepage
+            searchEngine = settingsDefaults.searchEngine
+            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
+            restoreSession = settingsDefaults.restoreSession
+        }
+    }
+
+    QtObject {
+        id: settingsDefaults
+
+        readonly property url homepage: "http://start.ubuntu.com"
+        readonly property string searchEngine: "google"
+        readonly property string allowOpenInBackgroundTab: "default"
+        readonly property bool restoreSession: true
+    }
+
     Item {
         anchors.fill: parent
 
@@ -137,8 +159,8 @@
         }
 
         SearchEngine {
-            id: searchEngine
-            filename: browser.searchEngine
+            id: currentSearchEngine
+            filename: settings.searchEngine
         }
 
         Chrome {
@@ -147,7 +169,7 @@
             visible: !recentView.visible
 
             webview: browser.currentWebview
-            searchUrl: searchEngine.urlTemplate
+            searchUrl: currentSearchEngine.urlTemplate
 
             function isCurrentUrlBookmarked() {
                 return ((webview && browser.bookmarksModel) ? browser.bookmarksModel.contains(webview.url) : false)
@@ -527,8 +549,8 @@
                         onTriggered: browser.openUrlInNewTab(contextualData.href, true)
                     }
                     Actions.OpenLinkInNewBackgroundTab {
-                        enabled: contextualData.href.toString() && ((browser.allowOpenInBackgroundTab === "true") ||
-                                 ((browser.allowOpenInBackgroundTab === "default") && (formFactor === "desktop")))
+                        enabled: contextualData.href.toString() && ((settings.allowOpenInBackgroundTab === "true") ||
+                                 ((settings.allowOpenInBackgroundTab === "default") && (formFactor === "desktop")))
                         onTriggered: browser.openUrlInNewTab(contextualData.href, false)
                     }
                     Actions.BookmarkLink {
@@ -786,7 +808,7 @@
         running: true
         interval: 1
         onTriggered: {
-            if (browser.restoreSession) {
+            if (!browser.newSession && settings.restoreSession) {
                 session.restore()
             }
             // Sanity check
@@ -796,7 +818,7 @@
                 browser.openUrlInNewTab(browser.initialUrls[i], true, false)
             }
             if (tabsModel.count == 0) {
-                browser.openUrlInNewTab(browser.homepage, true, false)
+                browser.openUrlInNewTab(settings.homepage, true, false)
             }
             tabsModel.currentTab.load()
             if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState && (formFactor == "desktop")) {

=== modified file 'src/app/webbrowser/CMakeLists.txt'
--- src/app/webbrowser/CMakeLists.txt	2015-02-18 21:37:39 +0000
+++ src/app/webbrowser/CMakeLists.txt	2015-03-27 10:06:40 +0000
@@ -28,7 +28,6 @@
 set(WEBBROWSER_APP_SRC
     file-operations.cpp
     searchengine.cpp
-    settings.cpp
     webbrowser-app.cpp
 )
 

=== removed file 'src/app/webbrowser/settings.cpp'
--- src/app/webbrowser/settings.cpp	2015-03-19 11:58:33 +0000
+++ src/app/webbrowser/settings.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013-2015 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "settings.h"
-#include "config.h"
-
-// Qt
-#include <QtCore/QSettings>
-
-Settings::Settings(QObject* parent)
-    : QObject(parent)
-{
-    QSettings settings(QCoreApplication::applicationName(), "settings");
-    m_homepage = settings.value("homepage", QUrl(DEFAULT_HOMEPAGE)).toUrl();
-    m_searchengine = settings.value("searchengine", QString(DEFAULT_SEARCH_ENGINE)).toString();
-    m_allowOpenInBackgroundTab = settings.value("allowOpenInBackgroundTab", "default").toString().toLower();
-    m_restoreSession = settings.value("restoreSession", true).toBool();
-}
-
-const QUrl& Settings::homepage() const
-{
-    return m_homepage;
-}
-
-const QString& Settings::searchEngine() const
-{
-    return m_searchengine;
-}
-
-const QString& Settings::allowOpenInBackgroundTab() const
-{
-    return m_allowOpenInBackgroundTab;
-}
-
-bool Settings::restoreSession() const
-{
-    return m_restoreSession;
-}

=== removed file 'src/app/webbrowser/settings.h'
--- src/app/webbrowser/settings.h	2015-03-19 11:58:33 +0000
+++ src/app/webbrowser/settings.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright 2013-2015 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __SETTINGS_H__
-#define __SETTINGS_H__
-
-// Qt
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
-
-/*
- * Temporary helper class for read-only settings
- * until Settings support lands in the SDK.
- */
-class Settings : public QObject
-{
-    Q_OBJECT
-
-public:
-    Settings(QObject* parent=0);
-
-    const QUrl& homepage() const;
-    const QString& searchEngine() const;
-    const QString& allowOpenInBackgroundTab() const;
-    bool restoreSession() const;
-
-private:
-    QUrl m_homepage;
-    QString m_searchengine;
-    QString m_allowOpenInBackgroundTab; //"true" for enabled, "default" for form factor dependend behaviour (currently desktop only), anything else disables the option
-    bool m_restoreSession; // true by default
-};
-
-#endif // __SETTINGS_H__

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2015-03-19 11:58:33 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2015-03-27 10:06:40 +0000
@@ -27,7 +27,6 @@
 #include "history-domainlist-chronological-model.h"
 #include "limit-proxy-model.h"
 #include "searchengine.h"
-#include "settings.h"
 #include "tabs-model.h"
 #include "webbrowser-app.h"
 
@@ -95,12 +94,7 @@
     qmlRegisterType<SearchEngine>(uri, 0, 1, "SearchEngine");
 
     if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml")) {
-        Settings settings;
-        m_window->setProperty("homepage", settings.homepage());
-        m_window->setProperty("searchEngine", settings.searchEngine());
-        m_window->setProperty("allowOpenInBackgroundTab", settings.allowOpenInBackgroundTab());
-        m_window->setProperty("restoreSession", settings.restoreSession() &&
-                                                !m_arguments.contains("--new-session"));
+        m_window->setProperty("newSession", m_arguments.contains("--new-session"));
         QVariantList urls;
         Q_FOREACH(const QUrl& url, this->urls()) {
             urls.append(url);

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2015-01-29 22:25:54 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2015-03-27 10:06:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -23,12 +23,8 @@
 BrowserWindow {
     id: window
 
-    property alias searchEngine: browser.searchEngine
-    property alias restoreSession: browser.restoreSession
-    property alias allowOpenInBackgroundTab: browser.allowOpenInBackgroundTab
-
-    property alias homepage: browser.homepage
     property alias urls: browser.initialUrls
+    property alias newSession: browser.newSession
 
     currentWebview: browser.currentWebview