Merge lp:~tpeeters/ubuntu-ui-toolkit/qt56fixes2sections into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

void.

Do not approve yet! Testing on CI.

[lp:~tpeeters/ubuntu-ui-toolkit/qt56fixes2sections]

2111. By Tim Peeters on 2016-09-19

link bug

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1198/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6519/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1198/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/12/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6520/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/12/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1448/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6521/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1448/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1232/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6522/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1232/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1441/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6523/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1441/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2111
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/774/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1441/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1448/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1232/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1198/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/12/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6524/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6523
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6521
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6522
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6519
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6520

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/774/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/qt56fixes2sections]

2112. By Tim Peeters on 2016-09-21

clean

2113. By Tim Peeters on 2016-09-21

sync staging

2114. By Tim Peeters on 2016-09-21

update MainView 1.2

2115. By Tim Peeters on 2016-09-21

add mainview13 unit tests

2116. By Tim Peeters on 2016-09-21

update mainview 1.3 tests

2117. By Tim Peeters on 2016-09-21

clean Settings.qml versions

2118. By Tim Peeters on 2016-09-21

update OrientationHelpers, revert orientation tests and add FIXME.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1217/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6620/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1217/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/qt56fixes2sections]

2119. By Tim Peeters on 2016-09-21

clean. Link a bug

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1467/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6621/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1467/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1460/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6622/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1460/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1251/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6623/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1251/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/31/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6624/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/31/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2118
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/780/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1460/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1467/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1251/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1217/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/31/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6625/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6622
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6621
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6623
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6620
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6624

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/780/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tpeeters/ubuntu-ui-toolkit/qt56fixes2sections]

2120. By Tim Peeters on 2016-09-21

move new test to visual/

2121. By Tim Peeters on 2016-09-21

update MainView12

2122. By Tim Peeters on 2016-09-21

don't test Settings with MainView 1.1

2123. By Tim Peeters on 2016-09-22

no settings test for 1.1

2124. By Tim Peeters on 2016-09-22

update versions in Settings.qml

2125. By Tim Peeters on 2016-09-22

change test name

2126. By Tim Peeters on 2016-09-22

kick

2127. By Tim Peeters on 2016-09-24

sync staging

2128. By Tim Peeters on 2016-09-25

kick CI again. Failed on device not found.

2129. By Tim Peeters on 2016-09-27

don't check if window is undefined in OrientationHelper

2130. By Tim Peeters on 2016-09-27

kick

Unmerged revisions

=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
--- src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-12 14:07:38 +0000
+++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-21 12:26:15 +0000
@@ -190,6 +190,11 @@
         new ContextPropertyChangeListener(context, QStringLiteral("FontUtils"));
     QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
                      fontUtilsListener, SLOT(updateContextProperty()));
+
+    // Make the context property 'window' available even before there is a window,
+    // so that in QML we do not have to check whether 'window' is defined, and no new
+    // context property will be added after all components are completed (bug #1621509).
+    context->setContextProperty("window", Q_NULLPTR);
 }
 
 void UbuntuToolkitModule::registerTypesToVersion(const char *uri, int major, int minor)

=== modified file 'src/imports/Components/1.2/MainView.qml'
--- src/imports/Components/1.2/MainView.qml	2015-12-17 09:13:29 +0000
+++ src/imports/Components/1.2/MainView.qml	2016-09-21 12:26:15 +0000
@@ -204,17 +204,17 @@
 
             // 'window' is defined by QML between startup and showing on the screen.
             // There is no signal for when it becomes available and re-declaring it is not safe.
-            property bool windowActive: typeof window != 'undefined'
+            property bool windowActive: window !== null
+            function updateWindowTitle() {
+                if (window) {
+                    window.title = headerItem.title;
+                }
+            }
             onWindowActiveChanged: {
-                window.title = headerItem.title
+                updateWindowTitle();
             }
-
-            Connections {
-                target: headerItem
-                onTitleChanged: {
-                    if (headerItem.windowActive)
-                        window.title = headerItem.title
-                }
+            onTitleChanged: {
+                updateWindowTitle();
             }
 
             useDeprecatedToolbar: mainView.useDeprecatedToolbar

=== modified file 'src/imports/Components/1.2/OrientationHelper.qml'
--- src/imports/Components/1.2/OrientationHelper.qml	2016-05-25 12:48:10 +0000
+++ src/imports/Components/1.2/OrientationHelper.qml	2016-09-21 12:26:15 +0000
@@ -129,20 +129,22 @@
           http://qt-project.org/doc/qt-5.1/qtqml/qml-qtqml2-qt.html
           http://qt-project.org/doc/qt-5.1/qtquick/qmlmodule-qtquick-window2-qtquick-window-2.html
          */
-        property bool windowActive: typeof window != 'undefined'
+        property bool windowActive: typeof window != 'undefined' && window !== null
 
         /*!
           Report the current orientation of the application via QWindow::contentOrientation.
           http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
          */
         function applyOrientation() {
-            if (windowActive && window)
-                window.contentOrientation = Screen.orientation
+            if (windowActive && window) {
+                window.contentOrientation = Screen.orientation;
+            }
         }
 
         onWindowActiveChanged: {
-            if (automaticOrientation)
+            if (automaticOrientation) {
                 applyOrientation();
+            }
         }
 
         Timer {

=== modified file 'src/imports/Components/1.3/MainView.qml'
--- src/imports/Components/1.3/MainView.qml	2016-07-27 15:40:52 +0000
+++ src/imports/Components/1.3/MainView.qml	2016-09-21 12:26:15 +0000
@@ -167,17 +167,17 @@
 
             // 'window' is defined by QML between startup and showing on the screen.
             // There is no signal for when it becomes available and re-declaring it is not safe.
-            property bool windowActive: typeof window != 'undefined'
+            property bool windowActive: window !== null
+            function updateWindowTitle() {
+                if (window) {
+                    window.title = headerItem.title;
+                }
+            }
             onWindowActiveChanged: {
-                window.title = headerItem.title
+                updateWindowTitle();
             }
-
-            Connections {
-                target: headerItem
-                onTitleChanged: {
-                    if (headerItem.windowActive)
-                        window.title = headerItem.title
-                }
+            onTitleChanged: {
+                updateWindowTitle();
             }
         }
 

=== modified file 'src/imports/Components/1.3/OrientationHelper.qml'
--- src/imports/Components/1.3/OrientationHelper.qml	2016-05-25 12:48:10 +0000
+++ src/imports/Components/1.3/OrientationHelper.qml	2016-09-21 12:26:15 +0000
@@ -129,20 +129,22 @@
           http://qt-project.org/doc/qt-5.1/qtqml/qml-qtqml2-qt.html
           http://qt-project.org/doc/qt-5.1/qtquick/qmlmodule-qtquick-window2-qtquick-window-2.html
          */
-        property bool windowActive: typeof window != 'undefined'
+        property bool windowActive: typeof window != 'undefined' && window !== null
 
         /*!
           Report the current orientation of the application via QWindow::contentOrientation.
           http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
          */
         function applyOrientation() {
-            if (windowActive && window)
-                window.contentOrientation = Screen.orientation
+            if (windowActive && window) {
+                window.contentOrientation = Screen.orientation;
+            }
         }
 
         onWindowActiveChanged: {
-            if (automaticOrientation)
+            if (automaticOrientation) {
                 applyOrientation();
+            }
         }
 
         Timer {

=== added file 'tests/unit/components/tst_window_context_property_init_bug1621509.13.qml'
--- tests/unit/components/tst_window_context_property_init_bug1621509.13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/components/tst_window_context_property_init_bug1621509.13.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+
+// Ubuntu.Components is not explicitly used below, but its import causes bug #1621509.
+import Ubuntu.Components 1.3
+
+TestCase {
+    id: testCase
+    name: "EmbeddedListView"
+    width: 100
+    height: 100
+
+    // Bug #1621509 only occurs when we wait for the window to be visible.
+    // Forces the components to be completed before the test functions are executed.
+    when: windowShown
+
+    Item {
+        id: testItem
+
+        // This property changes its value when a new context property is added.
+        property var myObject: objectOne
+        property int count: 0
+        onMyObjectChanged: {
+            count++;
+        }
+        Component.onCompleted: {
+            count = 0;
+            print("Component completed."); // must print something to reproduce the bug.
+        }
+        QtObject {
+            objectName: "one"
+            id: objectOne
+        }
+    }
+
+    function test_no_property_change_after_completed_bug1621509_bug1610231() {
+        compare(testItem.count, 0,
+                "The property was changed after the component was completed.");
+    }
+}

=== renamed directory 'tests/unit/mainview' => 'tests/unit/mainview11'
=== modified file 'tests/unit/mainview11/Settings.qml'
--- tests/unit/mainview/Settings.qml	2016-01-20 16:42:29 +0000
+++ tests/unit/mainview11/Settings.qml	2016-09-21 12:26:15 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.1
 import Qt.labs.settings 1.0
 
 MainView {

=== renamed file 'tests/unit/mainview/mainview.pro' => 'tests/unit/mainview11/mainview11.pro'
=== added directory 'tests/unit/mainview13'
=== added file 'tests/unit/mainview13/AppName.qml'
--- tests/unit/mainview13/AppName.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/AppName.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    objectName: "appName"
+    applicationName: "org.gnu.wildebeest"
+}

=== added file 'tests/unit/mainview13/LocalStorage.qml'
--- tests/unit/mainview13/LocalStorage.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/LocalStorage.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import QtQuick.LocalStorage 2.0
+
+MainView {
+    objectName: "localStorage"
+    applicationName: "tv.island.pacific"
+
+    Component.onCompleted: {
+        var db = LocalStorage.openDatabaseSync("pacific.island.tv", "1.0", "lorem ipsum", 1000)
+        db.transaction(function(tx){
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Island(name TEXT)')
+            tx.executeSql('INSERT INTO Island VALUES(?)', ['Tuvalu'])
+        })
+    }
+}

=== added file 'tests/unit/mainview13/PageStack.qml'
--- tests/unit/mainview13/PageStack.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/PageStack.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    objectName: "pageStack"
+    applicationName: "once.upon.a.time"
+
+    PageStack {
+        id: stack
+        objectName: "stack"
+        Component.onCompleted: stack.push(pageOnStack)
+
+        Page {
+            id: pageOnStack
+            objectName: "page"
+            title: 'Far far away' // sets the window title.
+            header: PageHeader {
+                title: pageOnStack.title
+            }
+        }
+    }
+}

=== added file 'tests/unit/mainview13/PageTitle.qml'
--- tests/unit/mainview13/PageTitle.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/PageTitle.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+MainView {
+    objectName: "pageTitle"
+    applicationName: "once.upon.a.time"
+
+    Page {
+        id: page
+        objectName: "page"
+        title: 'Once upon a time' // sets the window title
+        header: PageHeader {
+            title: page.title
+        }
+    }
+}

=== added file 'tests/unit/mainview13/Settings.qml'
--- tests/unit/mainview13/Settings.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/Settings.qml	2016-09-21 12:26:15 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Qt.labs.settings 1.0
+
+MainView {
+    objectName: "settings"
+    applicationName: "red.riding.hood"
+
+    Settings {
+        property alias nickname: textField.text
+    }
+
+    TextField {
+        id: textField
+        objectName: "textfield"
+        text: "Red"
+    }
+}

=== added file 'tests/unit/mainview13/mainview13.pro'
--- tests/unit/mainview13/mainview13.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/mainview13.pro	2016-09-21 12:26:15 +0000
@@ -0,0 +1,4 @@
+include(../test-include.pri)
+
+QT += gui
+SOURCES += tst_mainview.cpp

=== added file 'tests/unit/mainview13/tst_mainview.cpp'
--- tests/unit/mainview13/tst_mainview.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/mainview13/tst_mainview.cpp	2016-09-21 12:26:15 +0000
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2012-2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Christian Dywan <[e-mail]>
+ */
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QProcessEnvironment>
+#include <QtCore/QSettings>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QString>
+#include <QtCore/QTextCodec>
+#include <QtCore/QThread>
+#include <QtQml/QQmlEngine>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickView>
+#include <QtTest/QSignalSpy>
+#include <QtTest/QTest>
+#include <UbuntuToolkit/ubuntutoolkitmodule.h>
+#include <UbuntuToolkit/private/ucapplication_p.h>
+#include <UbuntuToolkit/private/ucunits_p.h>
+
+#include "uctestcase.h"
+
+UT_USE_NAMESPACE
+
+class tst_MainView : public QObject
+{
+    Q_OBJECT
+
+private:
+    QQuickView *view;
+
+public:
+    tst_MainView() :
+        view(0)
+    {
+    }
+
+    QQuickItem *loadTest(const QString &document)
+    {
+        // load the document
+        view->setSource(QUrl::fromLocalFile(document));
+        QTest::waitForEvents();
+
+        return view->rootObject();
+    }
+
+    QQuickItem *testItem(QQuickItem *that, const QString &identifier)
+    {
+        if (that->property(identifier.toLocal8Bit()).isValid())
+            return that->property(identifier.toLocal8Bit()).value<QQuickItem*>();
+
+        QList<QQuickItem*> children = that->findChildren<QQuickItem*>(identifier);
+        return (children.count() > 0) ? children[0] : 0;
+    }
+
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        QString modules(UBUNTU_QML_IMPORT_PATH);
+        QVERIFY(QDir(modules).exists());
+
+        view = new QQuickView;
+        QQmlEngine *quickEngine = view->engine();
+        UbuntuToolkitModule::initializeContextProperties(quickEngine);
+
+        view->setGeometry(0,0, UCUnits::instance()->gu(40), UCUnits::instance()->gu(30));
+        //add modules folder so we have access to the plugin from QML
+        QStringList imports = quickEngine->importPathList();
+        imports.prepend(QDir(modules).absolutePath());
+        quickEngine->setImportPathList(imports);
+    }
+
+    void cleanupTestCase()
+    {
+        delete view;
+    }
+
+    void testCase_AppName()
+    {
+        QQuickItem *root = loadTest("AppName.qml");
+        QVERIFY(root);
+        QQuickItem *mainView = root;
+        QString applicationName(mainView->property("applicationName").toString());
+        QCOMPARE(applicationName, QString("org.gnu.wildebeest"));
+        QCOMPARE(applicationName, QCoreApplication::applicationName());
+        QCOMPARE(QString(""), QCoreApplication::organizationName());
+    }
+
+    void testSetApplicationName() {
+        QString appName("com.ubuntu.foo");
+        UCApplication::instance()->setApplicationName(appName);
+        QCOMPARE(UCApplication::instance()->applicationName(), appName);
+        QCOMPARE(QCoreApplication::applicationName(), appName);
+        QCOMPARE(QString(""), QCoreApplication::organizationName());
+    }
+
+    void testExpectedDataFolder() {
+        QString appName("net.weight.gain");
+        UCApplication::instance()->setApplicationName(appName);
+        QString dataFolder(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
+        QString xdgDataHome(QProcessEnvironment::systemEnvironment().value("XDG_DATA_HOME",
+            QProcessEnvironment::systemEnvironment().value("HOME") + "/.local/share"));
+        QString expectedDataFolder(xdgDataHome + "/" + appName);
+        QCOMPARE(dataFolder, expectedDataFolder);
+    }
+
+    void testExpectedCacheFolder() {
+        QString appName("cat.long.very");
+        UCApplication::instance()->setApplicationName(appName);
+        QString cacheFolder(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
+        QString xdgCacheHome(QProcessEnvironment::systemEnvironment().value("XDG_CACHE_HOME",
+            QProcessEnvironment::systemEnvironment().value("HOME") + "/.cache"));
+        QString expectedCacheFolder(xdgCacheHome + "/" + appName);
+        QCOMPARE(cacheFolder, expectedCacheFolder);
+    }
+
+    void testLocalStorage() {
+        QQuickItem *root = loadTest("LocalStorage.qml");
+        QVERIFY(root);
+        QQuickItem *mainView = root;
+        QString applicationName(mainView->property("applicationName").toString());
+        QCOMPARE(applicationName, QString("tv.island.pacific"));
+        QCOMPARE(applicationName, QCoreApplication::applicationName());
+        QCOMPARE(QString(""), QCoreApplication::organizationName());
+        QString dataFolder(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
+        QString databaseFolder(dataFolder + "/Databases");
+        QVERIFY(QFile::exists(databaseFolder));
+        QString hash(QCryptographicHash::hash("pacific.island.tv", QCryptographicHash::Md5).toHex());
+        QString database(databaseFolder + "/" + hash + ".sqlite");
+        QVERIFY(QFile::exists(database));
+    }
+
+    QString getConfFile(QString applicationName) {
+        QString configFolder(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
+        QString subFolder(configFolder + "/" + applicationName);
+        QString filename(subFolder + "/" + applicationName + ".conf");
+        return filename;
+    }
+
+    void testLabsSettings() {
+        QString applicationName("red.riding.hood");
+        // Delete file if it exists to avoid false positives
+        QString filename(getConfFile(applicationName));
+        QFile::remove(filename);
+
+        QQuickItem *root = loadTest("Settings.qml");
+        QVERIFY(root);
+        QQuickItem *mainView = root;
+        QCOMPARE(applicationName, mainView->property("applicationName").toString());
+        QCOMPARE(QString(applicationName), QCoreApplication::organizationDomain());
+        QQuickItem *textField(testItem(mainView, "textfield"));
+        textField->setProperty("text", "Blue");
+        delete root;
+        QVERIFY(QFile::exists(filename));
+    }
+
+    void testQSettings() {
+        QString applicationName("i.prefer.pi");
+        // Delete file if it exists to avoid false positives
+        QString filename(getConfFile(applicationName));
+        QFile::remove(filename);
+
+        UCApplication::instance()->setApplicationName(applicationName);
+        // QSettings with defaults
+        QSettings mySettings;
+        mySettings.setValue("spam", "eggs");
+        // Force writing to disk
+        mySettings.sync();
+        QVERIFY(QFile::exists(filename));
+    }
+
+    void testNoWarnings_bug186065() {
+        // An empty MainView would suffice
+        QScopedPointer<UbuntuTestCase>testCase (new UbuntuTestCase("AppName.qml"));
+
+        // No warnings from QML
+        QCOMPARE(testCase->warnings(), 0);
+    }
+
+    void testWindowTitleFromPage() {
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("PageTitle.qml"));
+        QQuickItem *page = testCase->findItem<QQuickItem*>("page");
+        QCOMPARE(QString("Once upon a time"), page->property("title").toString());
+        QCOMPARE(testCase->title(), page->property("title").toString());
+    }
+
+    void testWindowTitleFromStack() {
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("PageStack.qml"));
+        QQuickItem *page = testCase->findItem<QQuickItem*>("page");
+        QCOMPARE(QString("Far far away"), page->property("title").toString());
+        QCOMPARE(testCase->title(), page->property("title").toString());
+    }
+};
+
+QTEST_MAIN(tst_MainView)
+
+#include "tst_mainview.moc"

=== modified file 'tests/unit/orientation/tst_orientation.cpp'
--- tests/unit/orientation/tst_orientation.cpp	2016-09-09 17:49:07 +0000
+++ tests/unit/orientation/tst_orientation.cpp	2016-09-21 12:26:15 +0000
@@ -52,12 +52,12 @@
         QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("ManualAngle.qml"));
         QQuickItem *helper = testCase->findItem<QQuickItem*>("helper");
         // No warning about "window" being undefined must appear
-        QSKIP("TypeError: Cannot set property 'contentOrientation' of null");
+        QSKIP("FIXME: We have no valid effectiveness tests for OrientationHelper. See bug #1626063.");
         QCOMPARE(testCase->warnings(), 0);
         QCOMPARE(helper->property("orientationAngle").toInt(), 90);
         // Verify expected values
         QQuickItem *checkpoint = testCase->findItem<QQuickItem*>("checkpoint");
-        // window.contentOrientation 
+        // window.contentOrientation
         QCOMPARE(checkpoint->property("contentOrientation").toInt(), helper->property("orientationAngle").toInt());
     }
 };

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2016-06-07 12:53:59 +0000
+++ tests/unit/runtest.sh	2016-09-21 12:26:15 +0000
@@ -45,8 +45,8 @@
   echo 'Examples:'
   echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/components/components) $(relpath ${SRC_DIR}/tests/unit/components/tst_label13.qml) minimal"
   echo ''
-  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/mainview)"
-  echo "  ../$(basename $0) mainview minimal"
+  echo "  cd $(relpath ${BUILD_DIR}/tests/unit/mainview13)"
+  echo "  ../$(basename $0) mainview13 minimal"
   echo "  cd ../../.."
   echo ''
   echo "  cd $(relpath ${BUILD_DIR}/tests/unit/visual)"

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2016-09-19 15:16:44 +0000
+++ tests/unit/unit.pro	2016-09-21 12:26:15 +0000
@@ -39,7 +39,8 @@
     scaling_image_provider \
     qquick_image_extension \
     performance \
-    mainview \
+    mainview11 \
+    mainview13 \
     i18n \
     arguments \
     argument \

=== renamed file 'tests/unit/visual/FIXME-QT56_pagehead_sections_bug1511839.13.qml' => 'tests/unit/visual/tst_pagehead_sections_bug1511839.13.qml'
--- tests/unit/visual/FIXME-QT56_pagehead_sections_bug1511839.13.qml	2016-09-16 11:13:32 +0000
+++ tests/unit/visual/tst_pagehead_sections_bug1511839.13.qml	2016-09-21 12:26:15 +0000
@@ -40,7 +40,6 @@
         stack.push(pageComponent)
     }
 
-    // FIXME: Tests failing with Qt 5.6. See bug #1624337.
     UbuntuTestCase {
         id: testCase
         name: "Page.head.sections"

=== renamed file 'tests/unit/visual/FIXME-QT56_sections.13.qml' => 'tests/unit/visual/tst_sections.13.qml'
--- tests/unit/visual/FIXME-QT56_sections.13.qml	2016-09-16 11:13:32 +0000
+++ tests/unit/visual/tst_sections.13.qml	2016-09-21 12:26:15 +0000
@@ -142,7 +142,6 @@
         name: "SectionsApi"
         when: windowShown
 
-        // FIXME: Fails with Qt 5.6. See bug #1610231.
         function initTestCase() {
             // The initially selected actions must be triggered.
             compare(label.text, "First action triggered.",