Merge lp:~osomon/webbrowser-app/remove-formFactor into lp:webbrowser-app

[Olivier Tilloy]

Remove the 'formFactor' context property, and replace all its uses by more meaningful conditions.

Note: as of 2016-02-07, there are 7 applications in the store that import Ubuntu.Web and have at least one reference to the 'formFactor' context property. Those are:

 com.nokia.heremaps 1.0.7
 com.ubuntu.developer.webapps.googleplus 0.7.1
 googleapps.mattirn 1.0.1
 mynewsapps.mattirn 1.0.4
 mywebsites.mattirn 1.0.1
 ubuntu.mattirn 1.0.1
 wikifoundation.mattirn 1.0.2

Canonical is responsible for the first two, we need to update them. I’m going to reach out to mattirn to suggest how to fix his apps so they don’t refer to 'formFactor'.

In any case, I don’t expect any important functionality to suddenly break even if the property was removed without updating those apps.

UPDATE: as of 2016-02-18, the last five apps in the above list (all by mattirn) have been updated, they don’t have references to 'formFactor' any longer. com.ubuntu.developer.webapps.googleplus has also been updated, the last remaining app is com.nokia.heremaps for which I’ve submitted an update (waiting for a review).

[Chris Coulson (chrisccoulson)]

I've added a comment inline to this

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1362
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2613/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1366
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1366
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6403
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6403/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27430

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/remove-formFactor]

1363. By Olivier Tilloy on 2016-02-10

Verify that a geolocation permission request originates from the webapp’s domain before silently accepting it.

1364. By Olivier Tilloy on 2016-02-10

When low on memory, the current public tab might have been unloaded, so reload it when exiting incognito mode.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1363
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2614/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1367
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1367
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27444

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1364
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2615/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6399
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1368
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1368
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27452

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

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

Overall looks good, a few questions below

[Olivier Tilloy (osomon)]

Thanks for your thorough review, I’ve replied to your questions (with more questions!) inline.

[Alexandre Abreu (abreu-alexandre)]

See replies

[lp:~osomon/webbrowser-app/remove-formFactor]

1365. By Olivier Tilloy on 2016-02-22

Document the value of the lowOnMemory threshold.

[Olivier Tilloy (osomon)]

Updated.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1365
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2625/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1378
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6597
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27783

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/remove-formFactor]

1366. By Olivier Tilloy on 2016-02-23

Do not try to load an non existent tab.

1367. By Olivier Tilloy on 2016-02-23

Raise the threshold for which a system is considered low on memory, from tests run on a MX4.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1367
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2628/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1381
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1381
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6612
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27824

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

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

+1

review: Approve

=== modified file 'README'
--- README	2015-04-01 05:57:42 +0000
+++ README	2016-02-23 11:14:53 +0000
@@ -86,11 +86,6 @@
    the OpenSearch document description format
    (http://www.opensearch.org/Specifications/OpenSearch/1.1)
 
- - '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	2016-01-28 16:23:17 +0000
+++ debian/control	2016-02-23 11:14:53 +0000
@@ -10,6 +10,7 @@
                dh-apparmor,
                dh-translations,
                hardening-wrapper,
+               libapparmor-dev,
                libevdev-dev,
                liboxideqt-qmlplugin (>= 1.9),
                libqt5sql5-sqlite,

=== modified file 'src/Ubuntu/Web/UbuntuWebView02.qml'
--- src/Ubuntu/Web/UbuntuWebView02.qml	2016-01-05 08:35:58 +0000
+++ src/Ubuntu/Web/UbuntuWebView02.qml	2016-02-23 11:14:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -51,7 +51,7 @@
         navigationRequestedDelegate(request);
     }
 
-    preferences.passwordEchoEnabled: formFactor === "mobile"
+    preferences.passwordEchoEnabled: Qt.inputMethod.visible
 
     popupMenu: ItemSelector02 {
         automaticOrientation: false

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2015-12-10 22:01:05 +0000
+++ src/Ubuntu/Web/plugin.cpp	2016-02-23 11:14:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -40,7 +40,6 @@
 
     Q_PROPERTY(QString cacheLocation READ cacheLocation NOTIFY cacheLocationChanged)
     Q_PROPERTY(QString dataLocation READ dataLocation NOTIFY dataLocationChanged)
-    Q_PROPERTY(QString formFactor READ formFactor CONSTANT)
     Q_PROPERTY(qreal screenDiagonal READ screenDiagonal NOTIFY screenDiagonalChanged)
     Q_PROPERTY(int cacheSizeHint READ cacheSizeHint NOTIFY cacheSizeHintChanged)
     Q_PROPERTY(QString webviewDevtoolsDebugHost READ devtoolsHost CONSTANT)
@@ -52,7 +51,6 @@
 
     QString cacheLocation() const;
     QString dataLocation() const;
-    QString formFactor();
     qreal screenDiagonal() const;
     int cacheSizeHint() const;
     QString devtoolsHost();
@@ -71,7 +69,6 @@
 
 private:
     qreal m_screenDiagonal; // in millimeters
-    QString m_formFactor;
     QString m_devtoolsHost;
     int m_devtoolsPort;
     QStringList m_hostMappingRules;
@@ -129,40 +126,6 @@
     return location.absolutePath();
 }
 
-QString UbuntuWebPluginContext::formFactor()
-{
-    if (m_formFactor.isEmpty()) {
-        // This implementation only considers two possible form factors: desktop,
-        // and mobile (which includes phones and tablets).
-        // XXX: do we need to consider other form factors, such as tablet?
-        const char* DESKTOP = "desktop";
-        const char* MOBILE = "mobile";
-
-        // The "DESKTOP_MODE" environment variable can be used to force the form
-        // factor to desktop, when set to any valid value other than 0.
-        const char* DESKTOP_MODE_ENV_VAR = "DESKTOP_MODE";
-        if (qEnvironmentVariableIsSet(DESKTOP_MODE_ENV_VAR)) {
-            QByteArray stringValue = qgetenv(DESKTOP_MODE_ENV_VAR);
-            bool ok = false;
-            int value = stringValue.toInt(&ok);
-            if (ok) {
-                m_formFactor = (value == 0) ? MOBILE : DESKTOP;
-                return m_formFactor;
-            }
-        }
-
-        // XXX: Assume that QtUbuntu means mobile, which is currently the case,
-        // but may not remain true forever.
-        QString platform = QGuiApplication::platformName();
-        if ((platform == "ubuntu") || (platform == "ubuntumirclient")) {
-            m_formFactor = MOBILE;
-        } else {
-            m_formFactor = DESKTOP;
-        }
-    }
-    return m_formFactor;
-}
-
 qreal UbuntuWebPluginContext::screenDiagonal() const
 {
     return m_screenDiagonal;

=== modified file 'src/app/BrowserView.qml'
--- src/app/BrowserView.qml	2016-01-12 09:37:08 +0000
+++ src/app/BrowserView.qml	2016-02-23 11:14:53 +0000
@@ -32,6 +32,8 @@
 
     property var osk: _osk
 
+    property bool hasTouchScreen: false
+
     // See http://design.canonical.com/2015/05/to-converge-onto-mobile-tablet-and-desktop-think-grid-units/
     readonly property bool wide: width >= units.gu(90)
 

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-01-28 18:54:35 +0000
+++ src/app/CMakeLists.txt	2016-02-23 11:14:53 +0000
@@ -7,6 +7,9 @@
 find_package(Qt5Quick REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 
+include(FindPkgConfig)
+pkg_check_modules(LIBAPPARMOR REQUIRED libapparmor)
+
 add_subdirectory(unity8)
 
 configure_file(
@@ -19,6 +22,7 @@
 set(COMMONLIB_SRC
     browserapplication.cpp
     favicon-fetcher.cpp
+    meminfo.cpp
     mime-database.cpp
     session-storage.cpp
     single-instance-manager.cpp
@@ -28,7 +32,8 @@
 add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC})
 
 include_directories(${unity8_SOURCE_DIR}/libs/UbuntuGestures
-                    ${unity8_SOURCE_DIR}/plugins)
+                    ${unity8_SOURCE_DIR}/plugins
+                    ${LIBAPPARMOR_INCLUDE_DIRS})
 target_link_libraries(${COMMONLIB}
     Qt5::Core
     Qt5::Gui
@@ -38,6 +43,7 @@
     Qt5::Widgets
     UbuntuGesturesQml
     InputInfo
+    ${LIBAPPARMOR_LDFLAGS}
 )
 
 file(GLOB QML_FILES *.qml)

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2016-01-28 18:54:35 +0000
+++ src/app/browserapplication.cpp	2016-02-23 11:14:53 +0000
@@ -16,9 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// system
+#include <cerrno>
+#include <cstring>
+#include <sys/apparmor.h>
+
 // Qt
 #include <QtCore/QMetaObject>
 #include <QtCore/QtGlobal>
+#include <QtGui/QTouchDevice>
 #include <QtNetwork/QNetworkInterface>
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
@@ -30,6 +36,7 @@
 #include "browserapplication.h"
 #include "config.h"
 #include "favicon-fetcher.h"
+#include "meminfo.h"
 #include "mime-database.h"
 #include "session-storage.h"
 #include "webbrowser-window.h"
@@ -100,19 +107,17 @@
     return QString();
 }
 
-static QObject* MimeDatabase_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new MimeDatabase();
-}
-
-static QObject* Direction_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    return new Direction();
-}
+#define MAKE_SINGLETON_FACTORY(type) \
+    static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \
+        Q_UNUSED(engine); \
+        Q_UNUSED(scriptEngine); \
+        return new type(); \
+    }
+
+MAKE_SINGLETON_FACTORY(MemInfo)
+MAKE_SINGLETON_FACTORY(MimeDatabase)
+MAKE_SINGLETON_FACTORY(Direction)
+
 
 bool BrowserApplication::initialize(const QString& qmlFileSubPath)
 {
@@ -149,6 +154,18 @@
         return false;
     }
 
+    bool runningConfined = true;
+    char* label;
+    char* mode;
+    if (aa_getcon(&label, &mode) != -1) {
+        if (strcmp(label, "unconfined") == 0) {
+            runningConfined = false;
+        }
+        free(label);
+    } else if (errno == EINVAL) {
+        runningConfined = false;
+    }
+
     QString devtoolsPort = inspectorPort();
     QString devtoolsHost = inspectorHost();
     bool inspectorEnabled = !devtoolsPort.isEmpty();
@@ -159,6 +176,7 @@
 
     const char* uri = "webbrowsercommon.private";
     qmlRegisterType<FaviconFetcher>(uri, 0, 1, "FaviconFetcher");
+    qmlRegisterSingletonType<MemInfo>(uri, 0, 1, "MemInfo", MemInfo_singleton_factory);
     qmlRegisterSingletonType<MimeDatabase>(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory);
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
 
@@ -179,6 +197,9 @@
     qmlEngineCreated(m_engine);
 
     QQmlContext* context = m_engine->rootContext();
+    context->setContextProperty("__runningConfined", runningConfined);
+    context->setContextProperty("unversionedAppId", unversionedAppId);
+
     m_component = new QQmlComponent(m_engine);
     m_component->loadUrl(QUrl::fromLocalFile(UbuntuBrowserDirectory() + "/" + qmlFileSubPath));
     if (!m_component->isReady()) {
@@ -187,7 +208,6 @@
     }
     m_webbrowserWindowProxy = new WebBrowserWindow();
     context->setContextProperty("webbrowserWindowProxy", m_webbrowserWindowProxy);
-    context->setContextProperty("unversionedAppId", unversionedAppId);
 
     QObject* browser = m_component->beginCreate(context);
     m_window = qobject_cast<QQuickWindow*>(browser);
@@ -198,6 +218,14 @@
     browser->setProperty("developerExtrasEnabled", inspectorEnabled);
     browser->setProperty("forceFullscreen", m_arguments.contains("--fullscreen"));
 
+    bool hasTouchScreen = false;
+    Q_FOREACH(const QTouchDevice* device, QTouchDevice::devices()) {
+        if (device->type() == QTouchDevice::TouchScreen) {
+            hasTouchScreen = true;
+        }
+    }
+    browser->setProperty("hasTouchScreen", hasTouchScreen);
+
     return true;
 }
 

=== added file 'src/app/meminfo.cpp'
--- src/app/meminfo.cpp	1970-01-01 00:00:00 +0000
+++ src/app/meminfo.cpp	2016-02-23 11:14:53 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+#include "meminfo.h"
+
+// Qt
+#include <QtCore/QByteArray>
+#include <QtCore/QFile>
+#include <QtCore/QRegExp>
+#include <QtCore/QString>
+#include <QtCore/QtGlobal>
+
+MemInfo::MemInfo(QObject* parent)
+    : QObject(parent)
+    , m_total(0)
+    , m_free(0)
+{
+    // Default interval: 5000 ms
+    m_timer.setInterval(5000);
+    connect(&m_timer, SIGNAL(timeout()), SLOT(update()));
+    // Active by default
+    m_timer.start();
+}
+
+MemInfo::~MemInfo()
+{}
+
+const bool MemInfo::active() const
+{
+    return m_timer.isActive();
+}
+
+void MemInfo::setActive(bool active)
+{
+    if (active != m_timer.isActive()) {
+        if (active) {
+            m_timer.start();
+        } else {
+            m_timer.stop();
+        }
+        Q_EMIT activeChanged();
+    }
+}
+
+const int MemInfo::interval() const
+{
+    return m_timer.interval();
+}
+
+void MemInfo::setInterval(int interval)
+{
+    if (interval != m_timer.interval()) {
+        m_timer.setInterval(interval);
+        Q_EMIT intervalChanged();
+    }
+}
+
+const int MemInfo::total() const
+{
+    return m_total;
+}
+
+const int MemInfo::free() const
+{
+    return m_free;
+}
+
+void MemInfo::update()
+{
+#if defined(Q_OS_LINUX)
+    // Inspired by glibtop_get_mem_s()
+    QFile meminfo(QStringLiteral("/proc/meminfo"));
+    if (!meminfo.open(QIODevice::ReadOnly)) {
+        return;
+    }
+    static QRegExp memTotalRegexp(QStringLiteral("MemTotal:\\s*(\\d+) kB\\n"));
+    static QRegExp memFreeRegexp(QStringLiteral("MemFree:\\s*(\\d+) kB\\n"));
+    static QRegExp buffersRegexp(QStringLiteral("Buffers:\\s*(\\d+) kB\\n"));
+    static QRegExp cachedRegexp(QStringLiteral("Cached:\\s*(\\d+) kB\\n"));
+    int parsedTotal = -1;
+    int parsedFree = -1;
+    int parsedBuffers = -1;
+    int parsedCached = -1;
+    while ((parsedTotal == -1) || (parsedFree == -1) ||
+           (parsedBuffers == -1) || (parsedCached == -1)) {
+        QByteArray line = meminfo.readLine();
+        if (line.isEmpty()) {
+            break;
+        }
+        if (memTotalRegexp.exactMatch(line)) {
+            parsedTotal = memTotalRegexp.cap(1).toInt();
+        } else if (memFreeRegexp.exactMatch(line)) {
+            parsedFree = memFreeRegexp.cap(1).toInt();
+        } else if (buffersRegexp.exactMatch(line)) {
+            parsedBuffers = buffersRegexp.cap(1).toInt();
+        } else if (cachedRegexp.exactMatch(line)) {
+            parsedCached = cachedRegexp.cap(1).toInt();
+        }
+    }
+    meminfo.close();
+    if ((parsedTotal != -1) && (parsedFree != -1) &&
+        (parsedBuffers != -1) && (parsedCached != -1)) {
+        bool totalUpdated = false;
+        if (parsedTotal != m_total) {
+            m_total = parsedTotal;
+            totalUpdated = true;
+        }
+        bool freeUpdated = false;
+        int newFree = parsedFree + parsedCached + parsedBuffers;
+        if (newFree != m_free) {
+            m_free = newFree;
+            freeUpdated = true;
+        }
+        if (totalUpdated) {
+            Q_EMIT totalChanged();
+        }
+        if (freeUpdated) {
+            Q_EMIT freeChanged();
+        }
+    }
+#endif // Q_OS_LINUX
+}

=== added file 'src/app/meminfo.h'
--- src/app/meminfo.h	1970-01-01 00:00:00 +0000
+++ src/app/meminfo.h	2016-02-23 11:14:53 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 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 __MEMINFO_H__
+#define __MEMINFO_H__
+
+// Qt
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+
+class MemInfo : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
+
+    // Expressed in kB
+    Q_PROPERTY(int total READ total NOTIFY totalChanged)
+    Q_PROPERTY(int free READ free NOTIFY freeChanged)
+
+public:
+    MemInfo(QObject* parent=nullptr);
+    ~MemInfo();
+
+    const bool active() const;
+    void setActive(bool active);
+
+    const int interval() const;
+    void setInterval(int interval);
+
+    const int total() const;
+    const int free() const;
+
+Q_SIGNALS:
+    void activeChanged() const;
+    void intervalChanged() const;
+    void totalChanged() const;
+    void freeChanged() const;
+
+private Q_SLOTS:
+    void update();
+
+private:
+    QTimer m_timer;
+    int m_total;
+    int m_free;
+};
+
+#endif // __MEMINFO_H__

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-02-15 13:33:11 +0000
+++ src/app/webbrowser/Browser.qml	2016-02-23 11:14:53 +0000
@@ -47,10 +47,6 @@
 
     readonly property var tabsModel: incognito ? privateTabsModelLoader.item : publicTabsModel
 
-    // XXX: we might want to tweak this value depending
-    // on the form factor and/or the available memory
-    readonly property int maxLiveWebviews: 2
-
     // Restore only the n most recent tabs at startup,
     // to limit the overhead of instantiating too many
     // tab objects (see http://pad.lv/1376433).
@@ -59,6 +55,10 @@
     onTabsModelChanged: {
         if (incognito && privateTabsModelLoader.item) {
             browser.openUrlInNewTab("", true)
+        } else if (!incognito && tabsModel.currentTab) {
+            // If the system is low on memory, the current public tab might
+            // have been unloaded while browsing incognito, so reload it.
+            tabsModel.currentTab.load()
         }
     }
 
@@ -106,6 +106,11 @@
         deviceFilter: InputInfo.TouchPad
     }
 
+    InputDeviceModel {
+        id: touchScreenModel
+        deviceFilter: InputInfo.TouchScreen
+    }
+
     Component {
         id: mediaAccessDialogComponent
         MediaAccessDialog { }
@@ -151,7 +156,6 @@
 
         property url homepage: settingsDefaults.homepage
         property string searchEngine: settingsDefaults.searchEngine
-        property string allowOpenInBackgroundTab: settingsDefaults.allowOpenInBackgroundTab
         property bool restoreSession: settingsDefaults.restoreSession
         property int newTabDefaultSection: settingsDefaults.newTabDefaultSection
         property string defaultAudioDevice
@@ -160,7 +164,6 @@
         function restoreDefaults() {
             homepage  = settingsDefaults.homepage
             searchEngine = settingsDefaults.searchEngine
-            allowOpenInBackgroundTab = settingsDefaults.allowOpenInBackgroundTab
             restoreSession = settingsDefaults.restoreSession
             newTabDefaultSection = settingsDefaults.newTabDefaultSection
             defaultAudioDevice = settingsDefaults.defaultAudioDevice
@@ -173,7 +176,6 @@
 
         readonly property url homepage: "http://start.ubuntu.com"
         readonly property string searchEngine: "google"
-        readonly property string allowOpenInBackgroundTab: "default"
         readonly property bool restoreSession: true
         readonly property int newTabDefaultSection: 0
         readonly property string defaultAudioDevice: ""
@@ -461,8 +463,9 @@
         webview: browser.currentWebview
         forceHide: browser.fullscreen
         forceShow: recentView.visible
-        defaultMode: (formFactor == "desktop") ? Oxide.LocationBarController.ModeShown
-                                               : Oxide.LocationBarController.ModeAuto
+        defaultMode: (internal.hasMouse && !internal.hasTouchScreen)
+                         ? Oxide.LocationBarController.ModeShown
+                         : Oxide.LocationBarController.ModeAuto
     }
 
     Chrome {
@@ -480,6 +483,8 @@
 
         availableHeight: tabContainer.height - height - y
 
+        touchEnabled: internal.hasTouchScreen
+
         property bool hidden: false
         y: hidden ? -height : webview ? webview.locationBarController.offset : 0
         Behavior on y {
@@ -1080,10 +1085,7 @@
                     }
                     Actions.OpenLinkInNewBackgroundTab {
                         objectName: "OpenLinkInNewBackgroundTabContextualAction"
-                        enabled: contextModel && contextModel.linkUrl.toString() &&
-                                 ((settings.allowOpenInBackgroundTab === "true") ||
-                                  ((settings.allowOpenInBackgroundTab === "default") &&
-                                   (formFactor === "desktop")))
+                        enabled: contextModel && contextModel.linkUrl.toString()
                         onTriggered: browser.openUrlInNewTab(contextModel.linkUrl, false)
                     }
                     Actions.BookmarkLink {
@@ -1112,7 +1114,7 @@
                     }
                     Actions.Share {
                         objectName: "ShareContextualAction"
-                        enabled: (formFactor == "mobile") && contextModel &&
+                        enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel &&
                                  (contextModel.linkUrl.toString() || contextModel.selectionText)
                         onTriggered: {
                             if (contextModel.linkUrl.toString()) {
@@ -1339,9 +1341,9 @@
                             color: "white"
                             font.weight: Font.Light
                             anchors.centerIn: parent
-                            text: (formFactor == "mobile") ?
-                                      i18n.tr("Swipe Up To Exit Full Screen") :
-                                      i18n.tr("Press ESC To Exit Full Screen")
+                            text: bottomEdgeHandle.enabled
+                                      ? i18n.tr("Swipe Up To Exit Full Screen")
+                                      : i18n.tr("Press ESC To Exit Full Screen")
                         }
 
                         Timer {
@@ -1453,6 +1455,15 @@
         }
 
         readonly property bool hasMouse: (miceModel.count + touchPadModel.count) > 0
+        readonly property bool hasTouchScreen: touchScreenModel.count > 0
+
+        readonly property real freeMemRatio: (MemInfo.total > 0) ? (MemInfo.free / MemInfo.total) : 1.0
+        // Under that threshold, available memory is considered "low", and the
+        // browser is going to try and free up memory from unused tabs. This
+        // value was chosen empirically, it is subject to change to better
+        // reflect what a system under memory pressure might look like.
+        readonly property real lowOnMemoryThreshold: 0.3
+        readonly property bool lowOnMemory: freeMemRatio < lowOnMemoryThreshold
 
         function getOpenPages() {
             var urls = []
@@ -1765,11 +1776,12 @@
                     session.save()
                 }
                 if (browser.currentWebview) {
-                    // Workaround for a desktop bug where changing volume causes the app to
-                    // briefly lose focus to notify-osd, and therefore exit fullscreen mode.
-                    // We prevent this by exiting fullscreen only if the focus remains lost
-                    // for longer than a certain threshold. See: http://pad.lv/1477308
-                    if (formFactor == "desktop") exitFullscreenOnLostFocus.start()
+                    // Workaround for a desktop bug where changing volume causes
+                    // the app to briefly lose focus to notify-osd, and therefore
+                    // exit fullscreen mode. We prevent this by exiting fullscreen
+                    // only if the focus remains lost for longer than a certain
+                    // threshold. See: https://launchpad.net/bugs/694224.
+                    if (__platformName == "xcb") exitFullscreenOnLostFocus.start()
                     else browser.currentWebview.fullscreen = false
                 }
             } else exitFullscreenOnLostFocus.stop()
@@ -1838,15 +1850,41 @@
     }
 
     Connections {
-        // On mobile, ensure that at most n webviews are instantiated at all
-        // times, to reduce memory consumption (see http://pad.lv/1376418).
-        // Note: this works only in narrow mode, where the list of tabs is a
-        // stack. Switching from wide mode to narrow mode will result in
-        // undefined behaviour (tabs previously loaded won’t be unloaded).
-        target: ((formFactor == "mobile") && !browser.wide) ? tabsModel : null
-        onCurrentTabChanged: {
-            if (tabsModel.count > browser.maxLiveWebviews) {
-                tabsModel.get(browser.maxLiveWebviews).unload()
+        target: internal
+        onFreeMemRatioChanged: {
+            if (internal.lowOnMemory) {
+                // Unload an inactive tab to (hopefully) free up some memory
+                function getCandidate(model) {
+                    // Naive implementation that only takes into account the
+                    // last time a tab was current. In the future we might
+                    // want to take into account other parameters such as
+                    // whether the tab is currently playing audio/video.
+                    var candidate = null
+                    for (var i = 0; i < model.count; ++i) {
+                        var tab = model.get(i)
+                        if (tab.current || !tab.webview) {
+                            continue
+                        }
+                        if (!candidate || (candidate.lastCurrent > tab.lastCurrent)) {
+                            candidate = tab
+                        }
+                    }
+                    return candidate
+                }
+                var candidate = getCandidate(publicTabsModel)
+                if (candidate) {
+                    console.warn("Unloading background tab (%1) to free up some memory".arg(candidate.url))
+                    candidate.unload()
+                    return
+                } else if (browser.incognito) {
+                    candidate = getCandidate(privateTabsModelLoader.item)
+                    if (candidate) {
+                        console.warn("Unloading a background incognito tab to free up some memory")
+                        candidate.unload()
+                        return
+                    }
+                }
+                console.warn("System low on memory, but unable to pick a tab to unload")
             }
         }
     }

=== modified file 'src/app/webbrowser/BrowserTab.qml'
--- src/app/webbrowser/BrowserTab.qml	2016-02-11 10:38:44 +0000
+++ src/app/webbrowser/BrowserTab.qml	2016-02-23 11:14:53 +0000
@@ -39,6 +39,7 @@
     readonly property url icon: webview ? webview.icon : initialIcon
     property url preview
     property bool current: false
+    readonly property int lastCurrent: internal.lastCurrent
     property bool incognito
     visible: false
 
@@ -126,6 +127,7 @@
         id: internal
         property bool hiding: false
         property var incubator: null
+        property int lastCurrent: 0
     }
 
     // When current is set to false, delay hiding the tab contents to give it
@@ -133,6 +135,7 @@
     // only if embedders do not set the 'visible' property directly or
     // indirectly on instances of a BrowserTab.
     onCurrentChanged: {
+        internal.lastCurrent = Date.now()
         if (current) {
             internal.hiding = false
             z = 1

=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2016-01-26 17:44:49 +0000
+++ src/app/webbrowser/Chrome.qml	2016-02-23 11:14:53 +0000
@@ -40,6 +40,7 @@
     property alias showFaviconInAddressBar: navigationBar.showFaviconInAddressBar
     property alias availableHeight: navigationBar.availableHeight
     readonly property alias bookmarkTogglePlaceHolder: navigationBar.bookmarkTogglePlaceHolder
+    property bool touchEnabled: true
 
     signal switchToTab(int index)
     signal requestNewTab(int index, bool makeCurrent)
@@ -72,6 +73,7 @@
                 model: tabsModel
                 incognito: chrome.incognito
                 fgColor: navigationBar.fgColor
+                touchEnabled: chrome.touchEnabled
                 onSwitchToTab: chrome.switchToTab(index)
                 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)
                 onTabClosed: chrome.tabClosed(index)
@@ -82,7 +84,7 @@
                 left: parent.left
                 right: parent.right
             }
-            height: active ? (formFactor == "desktop" ? units.gu(3) : units.gu(4)) : 0
+            height: active ? (touchEnabled ? units.gu(4) : units.gu(3)) : 0
         }
 
         NavigationBar {

=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml	2015-11-30 09:38:08 +0000
+++ src/app/webbrowser/SettingsPage.qml	2016-02-23 11:14:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -113,25 +113,6 @@
             }
 
             ListItems.Standard {
-                objectName: "backgroundTabs"
-
-                text: i18n.tr("Allow opening new tabs in background")
-                highlightWhenPressed: false
-
-                control: CheckBox {
-                    id: allowOpenInBackgroundTabCheckbox
-                    onTriggered: settingsObject.allowOpenInBackgroundTab = checked ? 'true' : 'false'
-                }
-
-                Binding {
-                    target: allowOpenInBackgroundTabCheckbox
-                    property: "checked"
-                    value: settingsObject.allowOpenInBackgroundTab === 'true' ||
-                           (settingsObject.allowOpenInBackgroundTab === 'default' && formFactor === "desktop")
-                }
-            }
-
-            ListItems.Standard {
                 objectName: "privacy"
 
                 text: i18n.tr("Privacy & permissions")

=== modified file 'src/app/webbrowser/TabItem.qml'
--- src/app/webbrowser/TabItem.qml	2016-01-26 17:44:49 +0000
+++ src/app/webbrowser/TabItem.qml	2016-02-23 11:14:53 +0000
@@ -37,6 +37,8 @@
 
     property color fgColor: Theme.palette.normal.baseText
 
+    property bool touchEnabled: true
+
     signal selected()
     signal closed()
     signal contextMenu()
@@ -47,7 +49,7 @@
         anchors.rightMargin: tabItem.rightMargin
         source: "assets/tab-%1%2.sci".arg((active) ? "active" :
                                           (hoverArea.containsMouse ? "hover" : "non-active"))
-                                     .arg(formFactor == "desktop" ? "-desktop" : "")
+                                     .arg(touchEnabled ? "" : "-desktop")
 
         Favicon {
             id: favicon
@@ -121,15 +123,14 @@
             id: closeButton
             objectName: "closeButton"
 
-            // On mobile the tap area to close the tab occupies the whole right
+            // On touch the tap area to close the tab occupies the whole right
             // hand side of the tab, while it covers only the close icon in
             // other form factors
-            readonly property bool mobile: formFactor == "mobile"
-            anchors.fill: mobile ? undefined : closeIcon
-            anchors.top: mobile ? parent.top : undefined
-            anchors.bottom: mobile ? parent.bottom : undefined
-            anchors.right: mobile ? parent.right : undefined
-            width: mobile ? units.gu(4) : closeIcon.width
+            anchors.fill: touchEnabled ? undefined : closeIcon
+            anchors.top: touchEnabled ? parent.top : undefined
+            anchors.bottom: touchEnabled ? parent.bottom : undefined
+            anchors.right: touchEnabled ? parent.right : undefined
+            width: touchEnabled ? units.gu(4) : closeIcon.width
 
             onClicked: closed()
 

=== modified file 'src/app/webbrowser/TabsBar.qml'
--- src/app/webbrowser/TabsBar.qml	2016-01-26 17:44:49 +0000
+++ src/app/webbrowser/TabsBar.qml	2016-02-23 11:14:53 +0000
@@ -34,6 +34,8 @@
 
     property color fgColor: Theme.palette.normal.baseText
 
+    property bool touchEnabled: true
+
     signal switchToTab(int index)
     signal requestNewTab(int index, bool makeCurrent)
     signal tabClosed(int index)
@@ -111,7 +113,6 @@
         anchors {
             top: parent.top
             bottom: parent.bottom
-            bottomMargin: tabsContainer.verticalGap
             left: parent.left
         }
         width: tabWidth * root.model.count
@@ -153,6 +154,8 @@
                     icon: model.icon
                     fgColor: root.fgColor
 
+                    touchEnabled: root.touchEnabled
+
                     rightMargin: tabDelegate.rightMargin
 
                     onClosed: root.tabClosed(index)

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2016-01-22 10:23:29 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2016-02-23 11:14:53 +0000
@@ -82,6 +82,8 @@
         searchEnginesSearchPaths << UbuntuBrowserDirectory() + "/webbrowser/searchengines";
         m_engine->rootContext()->setContextProperty("searchEnginesSearchPaths", searchEnginesSearchPaths);
 
+        m_engine->rootContext()->setContextProperty("__platformName", platformName());
+
         m_window->setProperty("newSession", m_arguments.contains("--new-session"));
 
         QVariantList urls;

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-01-08 16:09:01 +0000
+++ src/app/webcontainer/WebApp.qml	2016-02-23 11:14:53 +0000
@@ -250,8 +250,9 @@
         ChromeController {
             webview: webapp.currentWebview
             forceHide: webapp.chromeless
-            defaultMode: (formFactor == "desktop") ? Oxide.LocationBarController.ModeShown
-                                                   : Oxide.LocationBarController.ModeAuto
+            defaultMode: webapp.hasTouchScreen
+                             ? Oxide.LocationBarController.ModeAuto
+                             : Oxide.LocationBarController.ModeShown
         }
     }
 

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2016-01-08 16:09:01 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2016-02-23 11:14:53 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -207,10 +207,6 @@
         samlRequestUrlPatternReceived(urlPattern)
     }
 
-    function shouldOpenPopupsInDefaultBrowser() {
-        return formFactor !== "desktop";
-    }
-
     function isRunningAsANamedWebapp() {
         return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
     }
@@ -328,13 +324,12 @@
     }
 
     onGeolocationPermissionRequested: {
-        if (formFactor == "desktop") {
+        if (__runningConfined && (request.origin == request.embedder)) {
+            // When running confined, querying the location service will trigger
+            // a system prompt (trust store), so no need for a custom one.
+            request.accept()
+        } else {
             requestGeolocationPermission(request)
-        } else {
-            // On devices where webapps are confined, trying to access the
-            // location service will trigger a system prompt from the trust
-            // store, so we don’t need a custom prompt.
-            request.accept()
         }
     }
 

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2016-02-03 11:56:56 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2016-02-23 11:14:53 +0000
@@ -158,16 +158,11 @@
             toolbar.click_action("newTabButton")
             tabs_view.visible.wait_for(False)
 
-        if self.main_window.wide or (model() == 'Desktop'):
-            new_count = count + 1
-        else:
-            max_webviews = self.main_window.maxLiveWebviews
-            new_count = (count + 1) if (count < max_webviews) else max_webviews
         if (self.main_window.incognito):
-            self.assert_number_incognito_webviews_eventually(new_count)
+            self.assert_number_incognito_webviews_eventually(count + 1)
             new_tab_view = self.main_window.get_new_private_tab_view()
         else:
-            self.assert_number_webviews_eventually(new_count)
+            self.assert_number_webviews_eventually(count + 1)
             new_tab_view = self.main_window.get_new_tab_view()
 
         if self.main_window.wide:

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2016-01-18 14:45:12 +0000
+++ tests/unittests/CMakeLists.txt	2016-02-23 11:14:53 +0000
@@ -22,3 +22,4 @@
 add_subdirectory(text-search-filter-model)
 add_subdirectory(downloads-model)
 add_subdirectory(single-instance-manager)
+add_subdirectory(meminfo)

=== added directory 'tests/unittests/meminfo'
=== added file 'tests/unittests/meminfo/CMakeLists.txt'
--- tests/unittests/meminfo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/meminfo/CMakeLists.txt	2016-02-23 11:14:53 +0000
@@ -0,0 +1,15 @@
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+set(TEST tst_MemInfoTests)
+set(SOURCES
+    ${webbrowser-common_SOURCE_DIR}/meminfo.cpp
+    tst_MemInfoTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-common_SOURCE_DIR})
+target_link_libraries(${TEST}
+    Qt5::Core
+    Qt5::Test
+)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -xunitxml -o ${TEST}.xml)
+set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

=== added file 'tests/unittests/meminfo/tst_MemInfoTests.cpp'
--- tests/unittests/meminfo/tst_MemInfoTests.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/meminfo/tst_MemInfoTests.cpp	2016-02-23 11:14:53 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2016 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/>.
+ */
+
+// Qt
+#include <QtCore/QObject>
+#include <QtTest/QSignalSpy>
+#include <QtTest/QtTest>
+
+// local
+#include "meminfo.h"
+
+class MemInfoTests : public QObject
+{
+    Q_OBJECT
+
+private:
+    MemInfo* meminfo;
+
+private Q_SLOTS:
+    void init()
+    {
+        meminfo = new MemInfo(this);
+    }
+
+    void cleanup()
+    {
+        delete meminfo;
+    }
+
+    void test_active_property()
+    {
+        QVERIFY(meminfo->active());
+        QSignalSpy spy(meminfo, SIGNAL(activeChanged()));
+
+        meminfo->setActive(true);
+        QVERIFY(spy.isEmpty());
+
+        meminfo->setActive(false);
+        QCOMPARE(spy.count(), 1);
+        QVERIFY(!meminfo->active());
+        spy.clear();
+
+        meminfo->setActive(false);
+        QVERIFY(spy.isEmpty());
+
+        meminfo->setActive(true);
+        QCOMPARE(spy.count(), 1);
+        QVERIFY(meminfo->active());
+    }
+
+    void test_interval_property()
+    {
+        QCOMPARE(meminfo->interval(), 5000);
+        QSignalSpy spy(meminfo, SIGNAL(intervalChanged()));
+
+        meminfo->setInterval(5000);
+        QVERIFY(spy.isEmpty());
+
+        meminfo->setInterval(1500);
+        QCOMPARE(spy.count(), 1);
+        QCOMPARE(meminfo->interval(), 1500);
+    }
+
+    void test_initial_values()
+    {
+        QCOMPARE(meminfo->total(), 0);
+        QCOMPARE(meminfo->free(), 0);
+    }
+
+    void test_update()
+    {
+        QSignalSpy totalSpy(meminfo, SIGNAL(totalChanged()));
+        QSignalSpy freeSpy(meminfo, SIGNAL(freeChanged()));
+        meminfo->setInterval(100);
+        totalSpy.wait();
+        freeSpy.wait();
+        QVERIFY(meminfo->total() > 0);
+        QVERIFY(meminfo->free() > 0);
+        QVERIFY(meminfo->total() > meminfo->free());
+    }
+};
+
+QTEST_MAIN(MemInfoTests)
+
+#include "tst_MemInfoTests.moc"