Merge lp:~aacid/unity8/new_and_old_audio_role into lp:unity8

[Albert Astals Cid]

Add an Item that proxies for old and new audio roles

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[lp:~aacid/unity8/new_and_old_audio_role]

2005. By Albert Astals Cid on 2015-10-22

Add an item that proxies for old and new audio roles

[Timo Jyrinki (timo-jyrinki)]

Compiled in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-012/+packages for Qt 5.5.1 and works great!

review: Approve

[Michał Sawicz (saviq)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2005
http://jenkins.qa.ubuntu.com/job/unity8-ci/6516/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4772
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4769
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24476
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/899
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/899/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24480

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6516/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/new_and_old_audio_role]

2006. By Albert Astals Cid on 2015-10-23

NotificationRole instead of AlarmRole

2007. By Albert Astals Cid on 2015-10-23

Rename the item to Notification too

[Albert Astals Cid (aacid)]

> This should be Notification, not Alarm.
Fixed

[Albert Astals Cid (aacid)]

> Could make that a binding instead of onCompleted, wdyt?
I think the code is harder to understand since you need to see that the binding code will only be executed once which is not trivial with a binding but quite clear with onCompleted.

I'd prefer to leave it like this.

[lp:~aacid/unity8/new_and_old_audio_role]

2008. By Albert Astals Cid on 2015-10-23

Make the else branch use 5.0 instead of 5.4

It's what the mock provides and also what our intial patches provided
Also move from onCompleted to a binding

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2007
http://jenkins.qa.ubuntu.com/job/unity8-ci/6523/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4782
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/763
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/906
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/906/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24496

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6523/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/new_and_old_audio_role]

2009. By Albert Astals Cid on 2015-10-23

Saviq doesn't like the two properties approach

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2008
http://jenkins.qa.ubuntu.com/job/unity8-ci/6526/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4787
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/909/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/766
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3859
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4784
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24514
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/537/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/909
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24515

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6526/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2009
http://jenkins.qa.ubuntu.com/job/unity8-ci/6530/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4796
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/913/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/770
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24525
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/539/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/913
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/913/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24527

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6530/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve (code)

[lp:~aacid/unity8/new_and_old_audio_role]

2010. By Albert Astals Cid on 2015-10-26

Merge

2011. By Albert Astals Cid on 2015-10-26

Merge use_quick_24

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2010
http://jenkins.qa.ubuntu.com/job/unity8-ci/6543/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4821
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/926/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1255
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/571/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1151
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/782/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/783/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4818
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24564
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/926/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6543/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/new_and_old_audio_role]

2012. By Albert Astals Cid on 2015-10-29

log--

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-21 11:51:38 +0000
+++ CMakeLists.txt	2015-10-26 15:55:17 +0000
@@ -49,13 +49,13 @@
                                        ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
 
 include(FindPkgConfig)
-find_package(Qt5Core 5.2 REQUIRED)
-find_package(Qt5Qml 5.2 REQUIRED)
-find_package(Qt5Quick 5.2 REQUIRED)
-find_package(Qt5Gui 5.2 REQUIRED)
-find_package(Qt5DBus 5.2 REQUIRED)
-find_package(Qt5Concurrent 5.2 REQUIRED)
-find_package(Qt5Sql 5.2 REQUIRED)
+find_package(Qt5Core 5.4 REQUIRED)
+find_package(Qt5Qml 5.4 REQUIRED)
+find_package(Qt5Quick 5.4 REQUIRED)
+find_package(Qt5Gui 5.4 REQUIRED)
+find_package(Qt5DBus 5.4 REQUIRED)
+find_package(Qt5Concurrent 5.4 REQUIRED)
+find_package(Qt5Sql 5.4 REQUIRED)
 
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=9)
 

=== modified file 'debian/control'
--- debian/control	2015-10-21 11:51:11 +0000
+++ debian/control	2015-10-26 15:55:17 +0000
@@ -42,15 +42,15 @@
                qml-module-qtsysteminfo,
                qml-module-qttest,
                qt5-default,
-               qtbase5-dev (>= 5.2.1),
+               qtbase5-dev (>= 5.4),
                qtbase5-dev-tools,
-               qtbase5-private-dev (>= 5.2.1),
-               qtdeclarative5-dev (>= 5.2.1),
+               qtbase5-private-dev (>= 5.4),
+               qtdeclarative5-dev (>= 5.4),
                qtdeclarative5-dev-tools,
-               qtdeclarative5-private-dev (>= 5.2.1),
+               qtdeclarative5-private-dev (>= 5.4),
                qtdeclarative5-qtmultimedia-plugin,
                qtdeclarative5-ubuntu-settings-components (>= 0.6),
-               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
+               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
                qtdeclarative5-ubuntu-web-plugin,
                ttf-ubuntu-font-family,
 Standards-Version: 3.9.4

=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2015-02-12 16:28:36 +0000
+++ plugins/Dash/CardAttributes.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 GridLayout {
     id: grid
@@ -27,7 +27,7 @@
     columns: 2 + repeater.count % 2
     rowSpacing: units.gu(.5)
     property alias model: repeater.model
-    property color color: Theme.palette.normal.baseText
+    property color color: theme.palette.normal.baseText
     property real fontScale: 1.0
 
     Repeater {

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-08-31 13:29:42 +0000
+++ plugins/Dash/CardCreator.js	2015-10-26 15:55:17 +0000
@@ -480,20 +480,20 @@
         }
     }
 
-    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
 
     var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
     var titleSubtitleCode = '';
     if (hasTitle) {
         var titleColor;
         if (headerAsOverlay) {
-            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
+            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
         } else if (hasSummary) {
             titleColor = 'summary.color';
         } else if (hasBackground) {
             titleColor = summaryColorWithBackground;
         } else {
-            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var titleAnchors;
@@ -649,7 +649,7 @@
         if (hasBackground) {
             summaryColor = summaryColorWithBackground;
         } else {
-            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
+            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
         }
 
         var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
@@ -697,8 +697,8 @@
 }
 
 function createCardComponent(parent, template, components) {
-    var imports = 'import QtQuick 2.2; \n\
-                   import Ubuntu.Components 1.1; \n\
+    var imports = 'import QtQuick 2.4; \n\
+                   import Ubuntu.Components 1.3; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
                    import Dash 0.1;\n\
                    import Utils 0.1;\n';

=== modified file 'plugins/Dash/CardCreatorCache.qml'
--- plugins/Dash/CardCreatorCache.qml	2014-05-05 14:45:04 +0000
+++ plugins/Dash/CardCreatorCache.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.2
+import QtQuick 2.4
 import "CardCreator.js" as CardCreator
 
 QtObject {

=== modified file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
--- plugins/Dash/CroppedImageMinimumSourceSize.qml	2015-08-31 13:29:42 +0000
+++ plugins/Dash/CroppedImageMinimumSourceSize.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Image    {
     id: root

=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ plugins/Dash/ScopeStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Utils 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 /*! \brief Helper for processing scope customization options.
 

=== modified file 'plugins/Dash/abstractdashview.h'
--- plugins/Dash/abstractdashview.h	2014-12-03 10:28:53 +0000
+++ plugins/Dash/abstractdashview.h	2015-10-26 15:55:17 +0000
@@ -109,11 +109,7 @@
     virtual void doRelayout() = 0;
     virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
     virtual void calculateImplicitHeight() = 0;
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-    virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
-#else
     virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
-#endif
 
     QQmlDelegateModel *m_delegateModel;
 

=== modified file 'plugins/Dash/horizontaljournal.cpp'
--- plugins/Dash/horizontaljournal.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/horizontaljournal.cpp	2015-10-26 15:55:17 +0000
@@ -182,11 +182,7 @@
     }
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
-#else
 void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
-#endif
 {
     Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
         for (int i = remove.count - 1; i >= 0; --i) {

=== modified file 'plugins/Dash/horizontaljournal.h'
--- plugins/Dash/horizontaljournal.h	2014-11-26 10:09:06 +0000
+++ plugins/Dash/horizontaljournal.h	2015-10-26 15:55:17 +0000
@@ -52,11 +52,7 @@
     void calculateImplicitHeight() override;
     void doRelayout() override;
     void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-    void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
-#else
     void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
-#endif
 
     int m_firstVisibleIndex;
     QList<QQuickItem*> m_visibleItems;

=== modified file 'plugins/Dash/organicgrid.cpp'
--- plugins/Dash/organicgrid.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/organicgrid.cpp	2015-10-26 15:55:17 +0000
@@ -235,11 +235,7 @@
     }
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
-#else
 void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
-#endif
 {
     Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
         for (int i = remove.count - 1; i >= 0; --i) {

=== modified file 'plugins/Dash/organicgrid.h'
--- plugins/Dash/organicgrid.h	2014-11-26 10:09:06 +0000
+++ plugins/Dash/organicgrid.h	2015-10-26 15:55:17 +0000
@@ -79,11 +79,7 @@
     void doRelayout() override;
     void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
     void calculateImplicitHeight() override;
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-    void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
-#else
     void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
-#endif
 
     QSizeF m_smallDelegateSize;
     QSizeF m_bigDelegateSize;

=== modified file 'plugins/Dash/verticaljournal.cpp'
--- plugins/Dash/verticaljournal.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/verticaljournal.cpp	2015-10-26 15:55:17 +0000
@@ -237,11 +237,7 @@
     }
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
-#else
 void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
-#endif
 {
     Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
         for (int i = remove.count - 1; i >= 0; --i) {

=== modified file 'plugins/Dash/verticaljournal.h'
--- plugins/Dash/verticaljournal.h	2014-11-26 10:09:06 +0000
+++ plugins/Dash/verticaljournal.h	2015-10-26 15:55:17 +0000
@@ -90,11 +90,7 @@
     void calculateImplicitHeight() override;
     void doRelayout() override;
     void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
-    void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
-#else
     void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
-#endif
 
     QVector<QList<ViewItem>> m_columnVisibleItems;
     QHash<int, int> m_indexColumnMap;

=== modified file 'qml/Components/Background.qml'
--- qml/Components/Background.qml	2014-08-29 08:47:21 +0000
+++ qml/Components/Background.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Utils 0.1 as Utils
 
 Loader {

=== modified file 'qml/Components/BaseCarouselDelegate.qml'
--- qml/Components/BaseCarouselDelegate.qml	2014-07-08 17:49:18 +0000
+++ qml/Components/BaseCarouselDelegate.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*!
  \brief Base delegate for use with the Carousel component

=== modified file 'qml/Components/Carousel.qml'
--- qml/Components/Carousel.qml	2015-08-28 12:39:43 +0000
+++ qml/Components/Carousel.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "carousel.js" as CarouselJS
 
 /*! The Carousel component presents the items of a model in a carousel view. It's similar to a

=== modified file 'qml/Components/Circle.qml'
--- qml/Components/Circle.qml	2013-06-05 22:03:08 +0000
+++ qml/Components/Circle.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Rectangle {
     antialiasing: true

=== modified file 'qml/Components/DelayedLockscreen.qml'
--- qml/Components/DelayedLockscreen.qml	2015-02-12 14:48:06 +0000
+++ qml/Components/DelayedLockscreen.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-10-09 12:36:14 +0000
+++ qml/Components/Dialogs.qml	2015-10-26 15:55:17 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 import Unity.Application 0.1
 import Unity.Session 0.1
-import Ubuntu.Components 1.1
 import GlobalShortcut 1.0
+import Ubuntu.Components 1.3
 import Unity.Platform 1.0
 import "../Greeter"
 

=== modified file 'qml/Components/DragHandle.qml'
--- qml/Components/DragHandle.qml	2015-04-10 21:16:37 +0000
+++ qml/Components/DragHandle.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/DraggingArea.qml'
--- qml/Components/DraggingArea.qml	2014-07-11 09:22:59 +0000
+++ qml/Components/DraggingArea.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: draggingArea

=== modified file 'qml/Components/EdgeDragEvaluator.qml'
--- qml/Components/EdgeDragEvaluator.qml	2015-04-27 15:30:18 +0000
+++ qml/Components/EdgeDragEvaluator.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'qml/Components/Header.qml'
--- qml/Components/Header.qml	2014-08-01 16:13:53 +0000
+++ qml/Components/Header.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 1.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
 
 PageHeadStyle {
     id: root

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2015-08-06 12:47:28 +0000
+++ qml/Components/InputMethod.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'qml/Components/LazyImage.qml'
--- qml/Components/LazyImage.qml	2014-09-29 20:55:54 +0000
+++ qml/Components/LazyImage.qml	2015-10-26 15:55:17 +0000
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Components/ListItems/Header.qml'
--- qml/Components/ListItems/Header.qml	2014-07-16 16:30:15 +0000
+++ qml/Components/ListItems/Header.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     property alias text: label.text

=== modified file 'qml/Components/ListItems/ThinDivider.qml'
--- qml/Components/ListItems/ThinDivider.qml	2013-06-27 09:50:24 +0000
+++ qml/Components/ListItems/ThinDivider.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Image {
     anchors {

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/Lockscreen.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.0
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1 as Telephony
 
 Showable {

=== added file 'qml/Components/NotificationAudio.qml'
--- qml/Components/NotificationAudio.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/NotificationAudio.qml	2015-10-26 15:55:17 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * 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 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/>.
+ */
+
+import QtQuick 2.4
+
+Item {
+    id: root
+    property string source: ""
+    readonly property var playbackState: priv.audio ? priv.audio.playbackState : 0
+
+    function play() {
+        priv.audio.play();
+    }
+    function stop() {
+        priv.audio.stop();
+    }
+
+    QtObject {
+        id: priv
+        property var audio: {
+            try {
+                return Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
+            } catch(err) {
+                console.log("Upstream audioRole enum not available, falling back to old role name.");
+                return Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert; onPlaybackStateChanged: console.log('sdfasdfasfd', playbackState); }", priv)
+            }
+        }
+    }
+}

=== modified file 'qml/Components/PanelState/PanelState.qml'
--- qml/Components/PanelState/PanelState.qml	2014-11-24 11:21:38 +0000
+++ qml/Components/PanelState/PanelState.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.0
+import QtQuick 2.4
 
 QtObject {
     id: root

=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PassphraseLockscreen.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/PhysicalKeysMapper.qml'
--- qml/Components/PhysicalKeysMapper.qml	2015-09-02 09:30:32 +0000
+++ qml/Components/PhysicalKeysMapper.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Powerd 0.1
 
 /*!

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2015-05-28 07:42:09 +0000
+++ qml/Components/PinLockscreen.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Components/PinPadButton.qml'
--- qml/Components/PinPadButton.qml	2015-03-18 17:27:30 +0000
+++ qml/Components/PinPadButton.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root

=== modified file 'qml/Components/Rating.qml'
--- qml/Components/Rating.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/Rating.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! Rating widget bar. */
 

=== modified file 'qml/Components/RatingStyle.qml'
--- qml/Components/RatingStyle.qml	2014-02-13 17:00:06 +0000
+++ qml/Components/RatingStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Row {
     anchors.fill: parent

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2014-10-23 11:59:22 +0000
+++ qml/Components/ResponsiveGridView.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*
    Essentially a GridView where you can specify the maximum number of columns it can have.

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2015-05-12 10:05:52 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 import Dash 0.1
 

=== modified file 'qml/Components/ScreenGrabber.qml'
--- qml/Components/ScreenGrabber.qml	2015-10-21 11:51:46 +0000
+++ qml/Components/ScreenGrabber.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtMultimedia 5.0
+import QtQuick 2.4
 import ScreenGrabber 0.1
 import GlobalShortcut 1.0
 
@@ -40,9 +39,8 @@
         onTriggered: capture()
     }
 
-    Audio {
+    NotificationAudio {
         id: shutterSound
-        audioRole: MediaPlayer.alert
         source: "/system/media/audio/ui/camera_click.ogg"
     }
 

=== modified file 'qml/Components/ScrollCalculator.qml'
--- qml/Components/ScrollCalculator.qml	2014-10-13 15:09:46 +0000
+++ qml/Components/ScrollCalculator.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: scrollArea

=== modified file 'qml/Components/SearchHistoryModel/SearchHistoryModel.qml'
--- qml/Components/SearchHistoryModel/SearchHistoryModel.qml	2014-07-03 10:06:28 +0000
+++ qml/Components/SearchHistoryModel/SearchHistoryModel.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  */
 
 pragma Singleton
-import QtQuick 2.0
+import QtQuick 2.4
 
 // TODO sanitize input, move to persistent storage
 

=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2015-08-24 15:39:53 +0000
+++ qml/Components/ShellDialog.qml	2015-10-26 15:55:17 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 /*
     A Dialog configured for use as a proper in-scene Dialog

=== modified file 'qml/Components/Showable.qml'
--- qml/Components/Showable.qml	2014-12-08 12:21:11 +0000
+++ qml/Components/Showable.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     id: showable

=== modified file 'qml/Components/StandardAnimation.qml'
--- qml/Components/StandardAnimation.qml	2013-06-05 22:03:08 +0000
+++ qml/Components/StandardAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 NumberAnimation {
     duration: 200

=== modified file 'qml/Components/UbuntuShapeForItem.qml'
--- qml/Components/UbuntuShapeForItem.qml	2014-10-06 07:39:42 +0000
+++ qml/Components/UbuntuShapeForItem.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
  * general (Item-based) components. This ability should be incorporated into the SDK's

=== modified file 'qml/Components/Unity8Settings.qml'
--- qml/Components/Unity8Settings.qml	2015-06-19 18:19:33 +0000
+++ qml/Components/Unity8Settings.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import GSettings 1.0
 
 QtObject {

=== modified file 'qml/Components/UnityInputInfo/UnityInputInfo.qml'
--- qml/Components/UnityInputInfo/UnityInputInfo.qml	2015-08-11 11:23:32 +0000
+++ qml/Components/UnityInputInfo/UnityInputInfo.qml	2015-10-26 15:55:17 +0000
@@ -16,10 +16,10 @@
 
 pragma Singleton
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Unity.InputInfo 0.1
 // Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
+++ qml/Components/WindowControlButtons.qml	2015-10-26 15:55:17 +0000
@@ -16,8 +16,8 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Row {
     id: root

=== modified file 'qml/Components/WindowScreenshot.qml'
--- qml/Components/WindowScreenshot.qml	2015-03-06 04:44:11 +0000
+++ qml/Components/WindowScreenshot.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 Item {
     id: root

=== modified file 'qml/Components/WrongPasswordAnimation.qml'
--- qml/Components/WrongPasswordAnimation.qml	2013-06-27 14:05:15 +0000
+++ qml/Components/WrongPasswordAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 SequentialAnimation {
     id: root

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Components/ZoomableImage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 /*! \brief Zoomable for image.

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2015-08-31 07:46:52 +0000
+++ qml/Dash/CardCarousel.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardGrid.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardHorizontalList.qml'
--- qml/Dash/CardHorizontalList.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardHorizontalList.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2015-09-01 08:38:39 +0000
+++ qml/Dash/CardTool.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Dash 0.1
 
 /*!

=== modified file 'qml/Dash/CardVerticalJournal.qml'
--- qml/Dash/CardVerticalJournal.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardVerticalJournal.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 DashRenderer {

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-08-31 10:24:42 +0000
+++ qml/Dash/Dash.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity 0.2
 import Utils 0.1

=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2015-05-12 14:39:11 +0000
+++ qml/Dash/DashApplication.qml	2015-10-26 15:55:17 +0000
@@ -14,15 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 
 MainView {
     implicitWidth: units.gu(40)
     implicitHeight: units.gu(68)
 
-    useDeprecatedToolbar: false
+    // Workaround bug #1475643
+    headerColor: Qt.rgba(0, 0, 0, 0)
 
     Dash {
         anchors.fill: parent

=== modified file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml	2015-04-13 18:28:54 +0000
+++ qml/Dash/DashBackground.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Image {
     source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"

=== modified file 'qml/Dash/DashCategoryBase.qml'
--- qml/Dash/DashCategoryBase.qml	2014-10-09 17:41:49 +0000
+++ qml/Dash/DashCategoryBase.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     width: parent.width

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-04-29 07:39:58 +0000
+++ qml/Dash/DashContent.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity 0.2
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Dash/DashContentTabBarStyle.qml'
--- qml/Dash/DashContentTabBarStyle.qml	2014-02-19 13:30:38 +0000
+++ qml/Dash/DashContentTabBarStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components.Themes.Ambiance 0.1
+import Ubuntu.Components.Themes.Ambiance 1.3
 
 TabBarStyle {
     indicatorImageSource: "graphics/tabbarchevron.png"

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigation.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components"
 
@@ -48,7 +48,7 @@
         id: d
         readonly property color foregroundColor: root.scopeStyle
                                                  ? root.scopeStyle.getTextColor(backgroundItem.luminance)
-                                                 : Theme.palette.normal.baseText
+                                                 : theme.palette.normal.baseText
         readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
         readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
         readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2015-01-05 15:08:04 +0000
+++ qml/Dash/DashNavigationButton.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: root
@@ -24,7 +24,7 @@
     // Set by parent
     property var scope: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     property bool isAltNavigation: false
     property bool showDivider: false
 

=== modified file 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashNavigationList.qml	2015-07-06 04:41:44 +0000
+++ qml/Dash/DashNavigationList.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import "../Components"
 
 Item {
@@ -24,7 +24,7 @@
     property var navigation: null
     property var currentNavigation: null
     property var scopeStyle: null
-    property color foregroundColor: Theme.palette.normal.baseText
+    property color foregroundColor: theme.palette.normal.baseText
     signal enterNavigation(var newNavigationId, bool hasChildren)
     signal goBackToParentClicked()
     signal allNavigationClicked()

=== renamed file 'qml/Dash/PageHeader.qml' => 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/PageHeader.qml	2015-03-13 10:07:57 +0000
+++ qml/Dash/DashPageHeader.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes.Ambiance 1.1
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import "../Components"
 import "../Components/SearchHistoryModel"
 
@@ -136,7 +136,7 @@
         objectName: "headerContainer"
         clip: contentY < height
         anchors { left: parent.left; top: parent.top; right: parent.right }
-        height: units.gu(7)
+        height: header.contentHeight
         contentHeight: headersColumn.height
         interactive: false
         contentY: showSearch ? 0 : height
@@ -171,18 +171,15 @@
             PageHeadStyle {
                 id: searchHeader
                 anchors { left: parent.left; right: parent.right }
-                height: headerContainer.height
-                contentHeight: height
                 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
                 __separator_visible: false
                 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
                 property var styledItem: searchHeader
-                property string title
                 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
-                property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                config: PageHeadConfiguration {
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: "back"
                         onTriggered: {
@@ -247,16 +244,15 @@
                 objectName: "innerPageHeader"
                 anchors { left: parent.left; right: parent.right }
                 height: headerContainer.height
-                contentHeight: height
                 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
                 __separator_visible: false
                 property var styledItem: header
-                property string title: root.title
                 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
                 property color panelColor: background.topColor
                 panelForegroundColor: config.foregroundColor
-                property var config: PageHeadConfiguration {
-                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
+                config: PageHeadConfiguration {
+                    title: root.title
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
                     backAction: Action {
                         iconName: backIsClose ? "close" : "back"
                         visible: root.showBackButton

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2015-01-14 09:51:39 +0000
+++ qml/Dash/DashRenderer.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     property real collapsedHeight

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-08-17 11:57:13 +0000
+++ qml/Dash/GenericScopeView.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity 0.2
 import Dash 0.1
@@ -573,7 +573,7 @@
                     }
                     fontSize: "small"
                     font.weight: Font.Bold
-                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                    color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                 }
             }
 
@@ -610,7 +610,7 @@
             width: categoryView.width
             height: section != "" ? units.gu(5) : 0
             text: section
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             iconName: delegate && delegate.headerLink ? "go-next" : ""
             onClicked: {
                 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
@@ -624,7 +624,7 @@
             sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
             Component {
                 id: pageHeaderComponent
-                PageHeader {
+                DashPageHeader {
                     objectName: "scopePageHeader"
                     width: parent.width
                     title: scopeView.scope ? scopeView.scope.name : ""
@@ -731,7 +731,7 @@
             }
             fontSize: "small"
             font.weight: Font.Bold
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         Connections {

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2015-09-14 11:07:25 +0000
+++ qml/Dash/PreviewListView.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "Previews" as Previews
@@ -43,7 +43,7 @@
 
     signal backClicked()
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         width: parent.width

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-08-24 11:20:41 +0000
+++ qml/Dash/Previews/Preview.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! \brief This component constructs the Preview UI.
  *

=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
--- qml/Dash/Previews/PreviewActionButton.qml	2014-08-14 12:01:03 +0000
+++ qml/Dash/Previews/PreviewActionButton.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Button {
     signal triggeredAction(var actionData)

=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	2014-08-15 08:40:36 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root
@@ -33,7 +33,7 @@
 
         objectName: "moreLessButton"
         text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
-        strokeColor: Theme.palette.normal.baseText
+        strokeColor: theme.palette.normal.baseText
         onClicked: expanded = !expanded
         width: parent.width
     }

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! This preview widget shows either one button, two buttons or one button
  *  and a combo button depending on the number of items in widgetData["actions"].
@@ -50,7 +50,7 @@
             Binding {
                 target: loader.item
                 property: "strokeColor"
-                value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             }
             Connections {
                 target: loader.item

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2015-08-03 14:27:48 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtMultimedia 5.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 /*! \brief Preview widget for audio tracks.
 
@@ -139,7 +139,7 @@
                             objectName: "trackTitleLabel"
                             anchors { top: parent.top; left: parent.left; right: parent.right }
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
                             text: modelData["title"]
@@ -152,7 +152,7 @@
                             anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
                             visible: text !== ""
                             opacity: 0.9
-                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                             font.weight: Font.Light
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
@@ -193,7 +193,7 @@
                         anchors.verticalCenter: parent.verticalCenter
                         width: parent.column3Width
                         opacity: 0.9
-                        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
                         fontSize: "small"
                         horizontalAlignment: Text.AlignRight
                         text: audio.lengthToString(modelData["length"])

=== modified file 'qml/Dash/Previews/PreviewComment.qml'
--- qml/Dash/Previews/PreviewComment.qml	2015-07-06 15:33:11 +0000
+++ qml/Dash/Previews/PreviewComment.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.2
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! \brief Preview widget for comments.
 

=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
--- qml/Dash/Previews/PreviewCommentInput.qml	2015-08-24 03:46:15 +0000
+++ qml/Dash/Previews/PreviewCommentInput.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for commenting.

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2015-09-15 12:05:09 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for expandable widgets.
@@ -41,7 +41,7 @@
             right: expandButton.left
         }
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -62,7 +62,7 @@
             width: units.gu(3)
             height: units.gu(3)
             name: root.expanded ? "view-collapse" : "view-expand"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         }
     }
 

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../"
 
@@ -40,7 +40,7 @@
         readonly property string title: root.widgetData["title"] || ""
         readonly property string subtitle: root.widgetData["subtitle"] || ""
         readonly property var attributes: root.widgetData["attributes"] || null
-        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
 
         // Rewire the source since we may have unwired it on onStatusChanged
         onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;

=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
--- qml/Dash/Previews/PreviewIconActions.qml	2015-07-08 10:55:38 +0000
+++ qml/Dash/Previews/PreviewIconActions.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! This preview widget icons+label for number of items in widgetData["actions"].
  *  For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".

=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! This preview widget shows a horizontal list of images.

=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
--- qml/Dash/Previews/PreviewOverlay.qml	2015-03-10 12:23:46 +0000
+++ qml/Dash/Previews/PreviewOverlay.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Rectangle {
@@ -158,7 +158,7 @@
                 anchors.centerIn: parent
                 width: units.gu(2.5)
                 height: width
-                color: Theme.palette.normal.foregroundText
+                color: theme.palette.normal.foregroundText
                 name: "close"
             }
         }

=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
--- qml/Dash/Previews/PreviewPayments.qml	2014-11-20 11:44:44 +0000
+++ qml/Dash/Previews/PreviewPayments.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Payments 0.1
 
 /*! \brief Preview widget for a purchase button.

=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
--- qml/Dash/Previews/PreviewProgress.qml	2014-04-30 10:51:30 +0000
+++ qml/Dash/Previews/PreviewProgress.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.DownloadDaemonListener 0.1
 
 /*! \brief Preview widget for a progress bar.

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-08-04 13:53:55 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating display.
@@ -60,7 +60,7 @@
                 urlIconEmpty: widgetData["rating-icon-empty"]
                 urlIconFull: widgetData["rating-icon-full"]
                 urlIconHalf: widgetData["rating-icon-half"]
-                labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+                labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
             }
         }
     }

=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
--- qml/Dash/Previews/PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for editable rating.
@@ -56,7 +56,7 @@
         urlIconEmpty: widgetData["rating-icon-empty"]
         urlIconFull: widgetData["rating-icon-full"]
         urlIconHalf: widgetData["rating-icon-half"]
-        labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     PreviewRatingInput {

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2015-08-31 10:40:59 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for rating.
@@ -79,7 +79,7 @@
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["rating-label"] || i18n.tr("Rate this")
         }
@@ -124,7 +124,7 @@
                 left: parent.left
                 right: parent.right
             }
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             opacity: .8
             text: widgetData["review-label"] || i18n.tr("Add a review")
         }
@@ -170,7 +170,7 @@
                     top: parent.top
                     right: parent.right
                 }
-                color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
+                color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
                 text: widgetData["submit-label"] || i18n.tr("Send")
                 onClicked: {
                     if (readyToSubmit) root.submit()

=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 Column {

=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	2015-04-13 10:37:41 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for table.
@@ -48,7 +48,7 @@
             }
             height: visible ? implicitHeight : 0
             fontSize: "large"
-            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
             visible: text !== ""
             opacity: .8
             text: widgetData["title"] || ""
@@ -72,7 +72,7 @@
                         fontSize: "small"
                         text: perRowRepeater.model[index]
                         visible: root.expanded || rowIndex < maximumCollapsedRowCount
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
                         font.bold: index == 0
                         wrapMode: Text.Wrap
                         Layout.alignment: Qt.AlignTop

=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml	2014-10-10 10:37:03 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for text.
@@ -39,7 +39,7 @@
         }
         height: visible ? implicitHeight : 0
         fontSize: "large"
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         visible: text !== ""
         opacity: .8
         text: widgetData["title"] || ""
@@ -61,7 +61,7 @@
         clip: true
         fontSize: "small"
         lineHeight: 1.2
-        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
+        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
         opacity: .8
         text: widgetData["text"] || ""
         wrapMode: Text.Wrap

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2014-03-31 13:06:36 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Thumbnailer 0.1
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2015-08-31 10:40:59 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /*! Interface for preview widgets. */
 

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-09-15 12:05:09 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 //! \brief This component loads the widgets based on widgetData["type"].
 

=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../../Components"
 
 /*! \brief Preview widget for image.

=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
--- qml/Dash/PullToRefreshScopeStyle.qml	2014-09-30 14:22:22 +0000
+++ qml/Dash/PullToRefreshScopeStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3
 
 /**
  * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799

=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-12-03 11:06:10 +0000
+++ qml/Dash/ScopeListView.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Dash 0.1
 
 ListViewWithPageHeader {

=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
--- qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 /*! Interface for settings widgets. */
 

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-02-10 11:35:11 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         CheckBox {

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingNumber.qml'
--- qml/Dash/ScopeSettings/ScopeSettingNumber.qml	2014-08-18 11:34:58 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingNumber.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 ScopeSettingString {
     mode: "number"

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
--- qml/Dash/ScopeSettings/ScopeSettingString.qml	2014-08-26 12:27:36 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ScopeSetting {
     id: root
@@ -44,7 +44,7 @@
             elide: Text.ElideMiddle
             maximumLineCount: 2
             wrapMode: Text.Wrap
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
         }
 
         TextField {
@@ -57,7 +57,7 @@
             }
             width: root.mode == "number" ? units.gu(8) : units.gu(12)
             text: widgetData.value
-            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
+            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText
             validator: root.mode == "number" ? doubleValidator : null
             hasClearButton: root.mode == "number" ? false : true
 

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml'
--- qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2014-08-26 12:33:32 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 
 //! \brief This component loads the widgets based on type.
 

=== modified file 'qml/Dash/ScopeSettingsPage.qml'
--- qml/Dash/ScopeSettingsPage.qml	2014-10-23 11:59:22 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity 0.2
 import "../Components"
 import "ScopeSettings"
@@ -28,7 +28,7 @@
 
     signal backClicked()
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         width: parent.width

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-07-08 09:55:58 +0000
+++ qml/Dash/ScopesList.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Dash 0.1
 
 Item {
@@ -61,7 +61,7 @@
         value: root.scope ? root.scope.searchQuery : ""
     }
 
-    PageHeader {
+    DashPageHeader {
         id: header
         objectName: "pageHeader"
         title: i18n.tr("Manage")

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2015-04-24 07:33:59 +0000
+++ qml/Dash/ScopesListCategory.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Dash 0.1
 import "../Components/ListItems" as ListItems
 
@@ -43,7 +43,7 @@
         id: header
         width: root.width
         height: units.gu(5)
-        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
+        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
     }
 
     readonly property double listItemHeight: units.gu(6)

=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml	2015-02-13 12:03:32 +0000
+++ qml/Dash/ScopesListCategoryItem.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 MouseArea {
     id: root

=== modified file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	2015-10-05 16:43:41 +0000
+++ qml/DeviceConfiguration.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 StateGroup {
     id: root

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-12-11 14:10:18 +0000
+++ qml/Greeter/Clock.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Panel/Indicators"
 import Unity.Indicators 0.1 as Indicators
 

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2015-05-11 14:36:03 +0000
+++ qml/Greeter/CoverPage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 

=== modified file 'qml/Greeter/Dot.qml'
--- qml/Greeter/Dot.qml	2013-06-05 22:03:08 +0000
+++ qml/Greeter/Dot.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Image {
     states: [

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-09-29 12:48:46 +0000
+++ qml/Greeter/Greeter.qml	2015-10-26 15:55:17 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import AccountsService 0.1
 import GSettings 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.SystemImage 0.1
 import Unity.Launcher 0.1
 import "../Components"

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2015-09-16 14:34:56 +0000
+++ qml/Greeter/Infographics.qml	2015-10-26 15:55:17 +0000
@@ -16,8 +16,8 @@
 
 import "../Components"
 import "Gradient.js" as Gradient
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: infographic

=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-06-06 02:23:50 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import IntegratedLightDM 0.1 as LightDM
 
 Item{

=== modified file 'qml/Greeter/LightDM.qml'
--- qml/Greeter/LightDM.qml	2015-06-08 14:29:42 +0000
+++ qml/Greeter/LightDM.qml	2015-10-26 15:55:17 +0000
@@ -19,7 +19,7 @@
  * plugin
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Loader {
     id: loader

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2015-02-01 19:53:29 +0000
+++ qml/Greeter/LoginList.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-07-17 08:11:51 +0000
+++ qml/Greeter/NarrowView.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Greeter/ObjectPositioner.qml'
--- qml/Greeter/ObjectPositioner.qml	2013-06-05 22:03:08 +0000
+++ qml/Greeter/ObjectPositioner.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     property int count

=== modified file 'qml/Greeter/ShimGreeter.qml'
--- qml/Greeter/ShimGreeter.qml	2015-04-22 23:55:23 +0000
+++ qml/Greeter/ShimGreeter.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 /*
  * This is a shim greeter that is only used to provide a shell,

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2015-03-04 13:23:34 +0000
+++ qml/Greeter/WideView.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 FocusScope {
     id: root

=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
--- qml/Launcher/FoldingLauncherDelegate.qml	2013-08-27 18:30:55 +0000
+++ qml/Launcher/FoldingLauncherDelegate.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 LauncherDelegate {
     id: root

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2015-09-29 12:48:46 +0000
+++ qml/Launcher/Launcher.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "../Components"
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Launcher 0.1
 

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2015-07-29 03:31:09 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-08-24 10:18:58 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-10-26 15:55:17 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
 import Unity.Launcher 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Popups 1.3
 import "../Components/ListItems"
 import "../Components/"
 

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-10-21 11:51:02 +0000
+++ qml/Notifications/Notification.qml	2015-10-26 15:55:17 +0000
@@ -14,14 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtMultimedia 5.0
+import QtQuick 2.4
 import Powerd 0.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Notifications 1.0
 import QMenuModel 0.1
 import Utils 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import "../Components"
 
 Item {
     id: notification
@@ -80,10 +80,9 @@
         return result;
     }
 
-    Audio {
+    NotificationAudio {
         id: sound
         objectName: "sound"
-        audioRole: MediaPlayer.alert
         source: hints["suppress-sound"] !== "true" && hints["sound-file"] !== undefined ? hints["sound-file"] : ""
     }
 
@@ -282,7 +281,7 @@
                         }
                         visible: type !== Notification.Confirmation
                         fontSize: "medium"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         elide: Text.ElideRight
                         textFormat: Text.PlainText
                     }
@@ -297,7 +296,7 @@
                         }
                         visible: body != "" && type !== Notification.Confirmation
                         fontSize: "small"
-                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                         wrapMode: Text.WordWrap
                         maximumLineCount: type == Notification.SnapDecision ? 12 : 2
                         elide: Text.ElideRight
@@ -338,7 +337,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 visible: type === Notification.Confirmation && body !== ""
                 fontSize: "medium"
-                color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
+                color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
                 wrapMode: Text.WordWrap
                 maximumLineCount: 1
                 elide: Text.ElideRight

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2015-10-15 14:33:48 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-10-26 15:55:17 +0000
@@ -17,8 +17,8 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import QMenuModel 0.1
 import "../Components"
 

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2015-10-15 14:33:48 +0000
+++ qml/Notifications/Notifications.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Notifications 1.0 as UnityNotifications
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Notifications/OptionToggle.qml'
--- qml/Notifications/OptionToggle.qml	2014-11-07 10:55:22 +0000
+++ qml/Notifications/OptionToggle.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 UbuntuShape {
     id: optionToggle
@@ -29,7 +29,7 @@
 
     signal triggered(string id)
 
-    color: Theme.palette.normal.base
+    color: theme.palette.normal.base
     borderSource: "none"
     height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
     width: parent.width

=== modified file 'qml/Notifications/ShapedIcon.qml'
--- qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:26 +0000
+++ qml/Notifications/ShapedIcon.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.2
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     property string fileSource

=== modified file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	2015-09-22 14:39:02 +0000
+++ qml/Notifications/SwipeToAct.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.2
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: swipeToAct

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-10-05 19:15:03 +0000
+++ qml/OrientedShell.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.4
+import QtQuick.Window 2.2
 import Unity.Session 0.1
 import GSettings 1.0
 import "Components"
@@ -23,7 +23,7 @@
 import "Rotation"
 // Backup Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
 // in case we remove the UnityInputInfo import
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: root

=== modified file 'qml/Panel/ActiveCallHint.qml'
--- qml/Panel/ActiveCallHint.qml	2014-10-08 21:05:50 +0000
+++ qml/Panel/ActiveCallHint.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Telephony 0.1 as Telephony
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 

=== modified file 'qml/Panel/Handle.qml'
--- qml/Panel/Handle.qml	2014-10-09 12:01:57 +0000
+++ qml/Panel/Handle.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: handle

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-09-15 22:50:16 +0000
+++ qml/Panel/IndicatorItem.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import "Indicators"
 

=== modified file 'qml/Panel/IndicatorItemRow.qml'
--- qml/Panel/IndicatorItemRow.qml	2015-08-04 07:02:08 +0000
+++ qml/Panel/IndicatorItemRow.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2015-09-15 22:50:16 +0000
+++ qml/Panel/IndicatorPage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1 as Components
+import QtQuick 2.4
+import Ubuntu.Components 1.3 as Components
 import Unity.Indicators 0.1 as Indicators
 import "Indicators"
 

=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
--- qml/Panel/Indicators/IndicatorBase.qml	2015-07-01 11:08:59 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Unity.Indicators 0.1
 
 Item {

=== modified file 'qml/Panel/Indicators/IndicatorDelegate.qml'
--- qml/Panel/Indicators/IndicatorDelegate.qml	2015-09-15 22:50:16 +0000
+++ qml/Panel/Indicators/IndicatorDelegate.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 IndicatorBase {
     readonly property bool indicatorVisible: rootActionState.indicatorVisible

=== modified file 'qml/Panel/Indicators/IndicatorsLight.qml'
--- qml/Panel/Indicators/IndicatorsLight.qml	2015-06-03 16:30:40 +0000
+++ qml/Panel/Indicators/IndicatorsLight.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Powerd 0.1
 import Lights 0.1
 import QMenuModel 0.1 as QMenuModel

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-09-29 14:46:24 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-10-26 15:55:17 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Settings.Menus 0.1 as Menus
 import Ubuntu.Settings.Components 0.1
 import QMenuModel 0.1
 import Utils 0.1 as Utils
-import Ubuntu.Components.ListItems 0.1 as ListItems
+import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components 1.3
 import Unity.Session 0.1
 
@@ -249,7 +249,7 @@
                     name: "settings"
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -281,7 +281,7 @@
                     source: menuData.icon
                     height: units.gu(3)
                     width: height
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
                 }
             }
         }
@@ -928,7 +928,7 @@
             enabled: menuData && menuData.sensitive || false
             highlightWhenPressed: false
             text: menuData && menuData.label || ""
-            foregroundColor: Theme.palette.normal.backgroundText
+            foregroundColor: theme.palette.normal.backgroundText
 
             onMenuModelChanged: {
                 loadAttributes();

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-10-07 10:35:05 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-10-26 15:55:17 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1 as QMenuModel

=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
--- qml/Panel/Indicators/ModemInfoItem.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/ModemInfoItem.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 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
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: menu
@@ -65,7 +65,7 @@
                 height: parent.height
                 Icon {
                     id: statusIcon
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight
@@ -75,7 +75,7 @@
 
                 Icon {
                     id: iconConnectivity
-                    color: Theme.palette.selected.backgroundText
+                    color: theme.palette.selected.backgroundText
 
                     Layout.preferredHeight: parent.height
                     Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
--- qml/Panel/Indicators/RoamingIndication.qml	2014-07-31 13:31:32 +0000
+++ qml/Panel/Indicators/RoamingIndication.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014,2015 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
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 RowLayout {
     spacing: units.gu(0.5)
@@ -30,7 +30,7 @@
 
     Icon {
         id: iconRoaming
-        color: Theme.palette.selected.backgroundText
+        color: theme.palette.selected.backgroundText
 
         Layout.preferredHeight: parent.height
         Layout.preferredWidth: Layout.preferredHeight

=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-09-22 10:57:15 +0000
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-10-26 15:55:17 +0000
@@ -18,9 +18,9 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import "../.."
 
 Page {

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2014-07-25 17:52:39 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-10-26 15:55:17 +0000
@@ -17,16 +17,16 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Rectangle {
     color: "black"
     id: root
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
     }
 
     PageStack {

=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
--- qml/Panel/Indicators/client/IndicatorsList.qml	2015-03-11 08:07:31 +0000
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2015-10-26 15:55:17 +0000
@@ -17,9 +17,9 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Unity.Indicators 0.1 as Indicators
 import "../.."
 

=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2014-11-11 15:28:13 +0000
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2015-10-26 15:55:17 +0000
@@ -17,8 +17,8 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import ".."
 

=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2015-08-20 14:07:45 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 Item {

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-08-20 14:07:45 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "Indicators"

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2014-11-17 23:04:48 +0000
+++ qml/Panel/MenuContent.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Indicators 0.1 as Indicators
 import Utils 0.1
 import "../Components"

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-09-29 12:48:46 +0000
+++ qml/Panel/Panel.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"

=== modified file 'qml/Panel/PanelBackground.qml'
--- qml/Panel/PanelBackground.qml	2013-06-05 22:03:08 +0000
+++ qml/Panel/PanelBackground.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Rectangle {
     color: "black"

=== modified file 'qml/Panel/PanelSeparatorLine.qml'
--- qml/Panel/PanelSeparatorLine.qml	2013-06-05 22:03:08 +0000
+++ qml/Panel/PanelSeparatorLine.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Rectangle {
     property real saturation: 1.0

=== modified file 'qml/Panel/PanelVelocityCalculator.qml'
--- qml/Panel/PanelVelocityCalculator.qml	2014-10-14 13:49:26 +0000
+++ qml/Panel/PanelVelocityCalculator.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'qml/Rotation/HalfLoopRotationAnimation.qml'
--- qml/Rotation/HalfLoopRotationAnimation.qml	2015-03-06 04:44:11 +0000
+++ qml/Rotation/HalfLoopRotationAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 SequentialAnimation {
     id: root

=== modified file 'qml/Rotation/ImmediateRotationAction.qml'
--- qml/Rotation/ImmediateRotationAction.qml	2015-04-01 16:33:31 +0000
+++ qml/Rotation/ImmediateRotationAction.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 ScriptAction {
     property var info

=== modified file 'qml/Rotation/NinetyRotationAnimation.qml'
--- qml/Rotation/NinetyRotationAnimation.qml	2015-03-06 04:44:11 +0000
+++ qml/Rotation/NinetyRotationAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 SequentialAnimation {
     id: root

=== modified file 'qml/Rotation/RotationStates.qml'
--- qml/Rotation/RotationStates.qml	2015-10-05 19:15:03 +0000
+++ qml/Rotation/RotationStates.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Powerd 0.1
 
 // Why the state machine is done that way:

=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-08-07 15:29:12 +0000
+++ qml/ScopeTool.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 import Utils 0.1
 import Unity 0.2

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-16 17:11:54 +0000
+++ qml/Shell.qml	2015-10-26 15:55:17 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.4
+import QtQuick.Window 2.2
 import AccountsService 0.1
 import Unity.Application 0.1
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Gestures 0.1
 import Ubuntu.Telephony 0.1 as Telephony
 import Unity.Connectivity 0.1
@@ -139,7 +139,7 @@
     }
 
     Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        theme.name = "Ubuntu.Components.Themes.SuruGradient"
         if (ApplicationManager.count > 0) {
             ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
         }

=== modified file 'qml/Stages/Animations/BaseSessionAnimation.qml'
--- qml/Stages/Animations/BaseSessionAnimation.qml	2014-09-02 15:51:20 +0000
+++ qml/Stages/Animations/BaseSessionAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 /* This is the base case for surface animations, used when adding/removing * child surfaces.
  * The class is meant to be overridden and changes/animations provided for state changes.

=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	2014-09-01 12:46:31 +0000
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 BaseSessionAnimation {
     id: animation

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-09-29 22:54:19 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 FocusScope {

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-09-29 23:09:06 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-10-26 15:55:17 +0000
@@ -16,8 +16,8 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 FocusScope {

=== modified file 'qml/Stages/DesktopSpread.qml'
--- qml/Stages/DesktopSpread.qml	2015-09-21 12:22:29 +0000
+++ qml/Stages/DesktopSpread.qml	2015-10-26 15:55:17 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 

=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
--- qml/Stages/DesktopSpreadDelegate.qml	2015-09-18 11:03:48 +0000
+++ qml/Stages/DesktopSpreadDelegate.qml	2015-10-26 15:55:17 +0000
@@ -16,8 +16,8 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 Item {

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-10-19 14:27:57 +0000
+++ qml/Stages/DesktopStage.qml	2015-10-26 15:55:17 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"

=== modified file 'qml/Stages/MainViewStyle.qml'
--- qml/Stages/MainViewStyle.qml	2014-09-12 20:16:54 +0000
+++ qml/Stages/MainViewStyle.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2012 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
@@ -13,51 +13,60 @@
  * 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.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
 Item {
-    // styling properties
     anchors.fill: parent
     z: -1
     id: mainViewStyle
 
-    /*!
-      The background texture of the main view. The image will be drawn over the background color,
-      so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
-     */
-    property url backgroundSource: "graphics/background_paper.png"
-    property var theme
+   property var theme
+
+    /*!
+      Color of the header's background.
+
+      \sa backgroundColor, footerColor
+    */
+    property color headerColor: styledItem.headerColor
+
+    /*!
+      Color of the background.
+
+      The background is usually a single color. However if \l headerColor
+      or \l footerColor are set then a gradient of colors will be drawn.
+
+      \sa footerColor, headerColor
+    */
+    property color backgroundColor: styledItem.backgroundColor
+
+    /*!
+      Color of the footer's background.
+
+      \sa backgroundColor, headerColor
+    */
+    property color footerColor: styledItem.footerColor
 
     Gradient {
         id: backgroundGradient
-        GradientStop { position: 0.0; color: styledItem.headerColor }
-        GradientStop { position: 0.83; color: styledItem.backgroundColor }
-        GradientStop { position: 1.0; color: styledItem.footerColor }
+        GradientStop { position: 0.0; color: mainViewStyle.headerColor }
+        GradientStop { position: 0.83; color: mainViewStyle.backgroundColor }
+        GradientStop { position: 1.0; color: mainViewStyle.footerColor }
     }
 
     Rectangle {
         id: backgroundColor
         anchors.fill: parent
-        color: styledItem.backgroundColor
+        color: mainViewStyle.backgroundColor
         gradient: internals.isGradient ? backgroundGradient : null
     }
 
-    Image {
-        id: backgroundTexture
-        anchors.fill: parent
-        source: mainViewStyle.theme.name === "Ambiance" ? mainViewStyle.backgroundSource : ""
-        fillMode: Image.Tile
-        asynchronous: true
-        cache: false
-        visible: status === Image.Ready
-    }
-
     QtObject {
         id: internals
-        property bool isGradient: styledItem.backgroundColor != styledItem.headerColor ||
-                                  styledItem.backgroundColor != styledItem.footerColor
+        property bool isGradient: mainViewStyle.backgroundColor != mainViewStyle.headerColor ||
+                                  mainViewStyle.backgroundColor != mainViewStyle.footerColor
+
         /*
           As we don't know the order the property bindings and onXXXChanged signals are evaluated
           we should rely only on one property when changing the theme to avoid intermediate
@@ -65,8 +74,7 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
           */
-        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
-                                (isGradient ? "SuruGradient" : "SuruDark")
+        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" : "SuruDark"
     }
 
     // automatically select the appropriate theme depending on the background colors

=== modified file 'qml/Stages/OrientationChangeAnimation.qml'
--- qml/Stages/OrientationChangeAnimation.qml	2015-04-24 09:53:37 +0000
+++ qml/Stages/OrientationChangeAnimation.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 QtObject {
     id: root

=== modified file 'qml/Stages/PageHeadStyle.qml'
--- qml/Stages/PageHeadStyle.qml	2014-08-27 18:50:43 +0000
+++ qml/Stages/PageHeadStyle.qml	2015-10-26 15:55:17 +0000
@@ -13,9 +13,9 @@
  * 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.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Styles 1.1 as Style
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Styles 1.3 as Style
 
 // FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
 Style.PageHeadStyle {

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-09-21 13:37:47 +0000
+++ qml/Stages/PhoneStage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Unity.Session 0.1

=== modified file 'qml/Stages/SessionContainer.qml'
--- qml/Stages/SessionContainer.qml	2015-09-09 13:44:12 +0000
+++ qml/Stages/SessionContainer.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "Animations"
 
 FocusScope {

=== modified file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	2015-04-21 19:43:25 +0000
+++ qml/Stages/ShimStage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Rectangle {
     id: shimStage

=== modified file 'qml/Stages/Splash.qml'
--- qml/Stages/Splash.qml	2015-07-10 15:55:50 +0000
+++ qml/Stages/Splash.qml	2015-10-26 15:55:17 +0000
@@ -14,12 +14,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Themes 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.3
 import "../Components"
 
-import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
+import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
 
 Item {
     id: root
@@ -62,17 +62,17 @@
                                                                                       : root.footerColor
 
         // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
-        property var theme: QtObject {
+        readonly property var fakeTheme: QtObject {
             property string name
-            property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
-                                                          import Ubuntu.Components.Themes.%1 1.1;\
-                                                          Palette {}".arg(styledItem.theme.name),
+            property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
+                                                          import Ubuntu.Components.Themes.%1 1.3;\
+                                                          Palette {}".arg(styledItem.fakeTheme.name),
                                                          styledItem, "dynamicPalette");
         }
 
         // FIXME: should instead use future toolkit API:
         // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
-        style: Component { MainViewStyle {theme: styledItem.theme} }
+        style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
     }
 
     StyledItem {
@@ -89,13 +89,13 @@
         property string title
         property var tabsModel
         property var config: QtObject {
-            property color foregroundColor: styledItem.theme.palette.selected.backgroundText
+            property color foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
             property var sections: QtObject {}
         }
 
         // FIXME: should instead use future toolkit API:
         // style: theme.createStyleComponent("PageHeadStyle.qml", header)
-        style: Component { PageHeadStyle {theme: styledItem.theme} }
+        style: Component { PageHeadStyle {theme: styledItem.fakeTheme} }
     }
 
     Image {
@@ -139,7 +139,7 @@
         anchors.topMargin: units.gu(2)
         fontSize: "large"
 
-        color: styledItem.theme.palette.selected.backgroundText
+        color: styledItem.fakeTheme.palette.selected.backgroundText
         visible: d.showIcon
     }
 

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-09-21 13:10:02 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-10-26 15:55:17 +0000
@@ -17,9 +17,9 @@
  *          Daniel d'Andrada <[e-mail]>
  */
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import QtQuick.Window 2.2
+import Ubuntu.Components 1.3
 import "../Components"
 
 FocusScope {

=== modified file 'qml/Stages/SpreadMaths.qml'
--- qml/Stages/SpreadMaths.qml	2015-07-14 16:16:42 +0000
+++ qml/Stages/SpreadMaths.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 Item {

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-09-30 14:25:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1 // For TouchGate
 import Utils 0.1 // for InputWatcher
 import Unity.Application 0.1 // for MirSurfaceItem

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-08-03 13:47:44 +0000
+++ qml/Stages/TabletStage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import Utils 0.1

=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
--- qml/Stages/TransformedSpreadDelegate.qml	2015-04-28 20:20:23 +0000
+++ qml/Stages/TransformedSpreadDelegate.qml	2015-10-26 15:55:17 +0000
@@ -16,9 +16,9 @@
  * Authors: Michael Zanetti <[e-mail]>
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 SpreadDelegate {
     id: root

=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-03-06 04:44:11 +0000
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-10-26 15:55:17 +0000
@@ -16,9 +16,9 @@
  * Authors: Michael Zanetti <[e-mail]>
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Utils 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import Unity.Application 0.1
 
 SpreadDelegate {

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2015-10-19 19:05:23 +0000
+++ qml/Stages/WindowDecoration.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Unity.Application 0.1 // For Mir singleton
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import "../Components"
 
 MouseArea {

=== modified file 'qml/Stages/WindowResizeArea.qml'
--- qml/Stages/WindowResizeArea.qml	2015-09-29 12:48:46 +0000
+++ qml/Stages/WindowResizeArea.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Utils 0.1
 import Unity.Application 0.1 // for Mir.cursorName
 

=== removed file 'qml/Stages/graphics/[e-mail]'
Binary files qml/Stages/graphics/[e-mail]	2014-08-06 20:38:48 +0000 and qml/Stages/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'qml/Tutorial/Arrow.qml'
--- qml/Tutorial/Arrow.qml	2014-12-18 23:32:42 +0000
+++ qml/Tutorial/Arrow.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Slider.qml'
--- qml/Tutorial/Slider.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/Slider.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/Tick.qml'
--- qml/Tutorial/Tick.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/Tick.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 MouseArea {
     implicitHeight: tick.height

=== modified file 'qml/Tutorial/Tutorial.qml'
--- qml/Tutorial/Tutorial.qml	2015-08-20 15:05:39 +0000
+++ qml/Tutorial/Tutorial.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialBottom.qml'
--- qml/Tutorial/TutorialBottom.qml	2015-04-10 21:16:37 +0000
+++ qml/Tutorial/TutorialBottom.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import "../Components"
 import "." as LocalComponents

=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
--- qml/Tutorial/TutorialBottomFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialBottomFinish.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2015-08-20 15:05:39 +0000
+++ qml/Tutorial/TutorialContent.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-06-16 22:25:29 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
--- qml/Tutorial/TutorialLeftFinish.qml	2015-01-06 14:46:52 +0000
+++ qml/Tutorial/TutorialLeftFinish.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "." as LocalComponents
 
 TutorialPage {

=== modified file 'qml/Tutorial/TutorialPage.qml'
--- qml/Tutorial/TutorialPage.qml	2015-01-09 21:51:24 +0000
+++ qml/Tutorial/TutorialPage.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import "../Components"
 
 Showable {

=== modified file 'qml/Tutorial/TutorialRight.qml'
--- qml/Tutorial/TutorialRight.qml	2015-02-18 21:31:54 +0000
+++ qml/Tutorial/TutorialRight.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
 import "../Components"

=== modified file 'qml/Wizard/CheckableSetting.qml'
--- qml/Wizard/CheckableSetting.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/CheckableSetting.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: listItem
@@ -77,7 +77,7 @@
                 rightMargin: listItem.rightMargin
             }
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: listItem.linkActivated(link)
         }
     }

=== modified file 'qml/Wizard/Page.qml'
--- qml/Wizard/Page.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Page.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Item {
     readonly property real buttonMargin: units.gu(2)
@@ -57,7 +57,7 @@
         }
         wrapMode: Text.Wrap
         text: title
-        color: Theme.palette.normal.baseText
+        color: theme.palette.normal.baseText
         font.pixelSize: units.gu(4)
     }
 

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2015-03-03 14:42:10 +0000
+++ qml/Wizard/Pages.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Wizard 0.1
 import "../Components"

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
 import Wizard 0.1
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- qml/Wizard/Pages/20-sim.qml	2015-05-19 18:56:17 +0000
+++ qml/Wizard/Pages/20-sim.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import MeeGo.QOfono 0.2
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2015-03-13 10:07:57 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 
@@ -111,13 +111,13 @@
 
             Component.onCompleted: {
                 // A visible selected background looks bad in ListItem widgets with our theme
-                originalBackground = Theme.palette.selected.background
-                Theme.palette.selected.background = "transparent"
+                originalBackground = theme.palette.selected.background
+                theme.palette.selected.background = "transparent"
             }
 
             Component.onDestruction: {
                 // Restore original theme background
-                Theme.palette.selected.background = originalBackground
+                theme.palette.selected.background = originalBackground
             }
         }
     }

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- qml/Wizard/Pages/40-wifi.qml	2015-02-03 15:00:26 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2015-10-26 15:55:17 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QMenuModel 0.1 as QMenuModel
 import QtSystemInfo 5.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Settings.Menus 0.1 as Menus
 import ".." as LocalComponents
 

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- qml/Wizard/Pages/50-location.qml	2015-07-21 09:08:49 +0000
+++ qml/Wizard/Pages/50-location.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import AccountsService 0.1
 import QMenuModel 0.1 as QMenuModel
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {
@@ -98,7 +98,7 @@
                 anchors.leftMargin: hereCheck.labelOffset
                 anchors.right: parent.right
                 wrapMode: Text.Wrap
-                linkColor: Theme.palette.normal.foregroundText
+                linkColor: theme.palette.normal.foregroundText
                 // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
                 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
                 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- qml/Wizard/Pages/60-reporting.qml	2015-10-05 02:14:13 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.Diagnostics 1.0
 import ".." as LocalComponents
 

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/80-finished.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import ".." as LocalComponents
 
 LocalComponents.Page {

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- qml/Wizard/Pages/here-terms.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/here-terms.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import AccountsService 0.1
 import Qt.labs.folderlistmodel 2.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Web 0.2
 import ".." as LocalComponents
 
@@ -102,7 +102,7 @@
             anchors.left: parent.left
             anchors.right: parent.right
             wrapMode: Text.Wrap
-            linkColor: Theme.palette.normal.foregroundText
+            linkColor: theme.palette.normal.foregroundText
             onLinkActivated: {
                 webview.url = link
                 termsLabel.visible = false

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- qml/Wizard/Pages/passwd-confirm.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- qml/Wizard/Pages/passwd-set.qml	2014-11-21 19:28:16 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents
 import "../../Components" as UnityComponents

=== modified file 'qml/Wizard/StackButton.qml'
--- qml/Wizard/StackButton.qml	2014-11-14 17:47:00 +0000
+++ qml/Wizard/StackButton.qml	2015-10-26 15:55:17 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 AbstractButton {
     id: stackButton
@@ -32,7 +32,7 @@
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.right: parent.right
-        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
+        color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)
         text: {
             if (backArrow) {
                 // Translators: This is the arrow for "Back" buttons

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2015-03-11 14:48:45 +0000
+++ qml/Wizard/Wizard.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Wizard 0.1
 import "../Components"
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-09-21 09:42:30 +0000
+++ tests/CMakeLists.txt	2015-10-26 15:55:17 +0000
@@ -132,3 +132,4 @@
 add_subdirectory(plugins)
 add_subdirectory(qmltests)
 add_subdirectory(whitespace)
+add_subdirectory(imports)

=== modified file 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/dash.py	2015-09-03 07:44:51 +0000
+++ tests/autopilot/unity8/dash.py	2015-10-26 15:55:17 +0000
@@ -158,7 +158,7 @@
     def enter_search_query(self, query, keyboard):
         current_header = self._get_current_page_header()
         search_button = \
-            current_header.select_single(objectName="search_header_button")
+            current_header.select_single(objectName="search_action_button")
         self.pointing_device.move(
             search_button.globalRect.x + search_button.width / 2,
             search_button.globalRect.y + search_button.height / 2)
@@ -224,7 +224,7 @@
         """
         category_element = self._get_category_element(category)
         icon = category_element.wait_select_single(
-            'AbstractButton', title=title)
+            'UCAbstractButton', title=title)
         list_view = self.select_single(
             ListViewWithPageHeader, objectName='categoryListView')
         list_view.swipe_child_into_view(icon)
@@ -247,7 +247,7 @@
         """
         category_element = self._get_category_element(category)
         see_all = category_element.select_single(objectName='seeAll')
-        application_cards = category_element.select_many('AbstractButton')
+        application_cards = category_element.select_many('UCAbstractButton')
 
         application_cards = sorted(
             (card for card in application_cards

=== added directory 'tests/imports'
=== added file 'tests/imports/CMakeLists.txt'
--- tests/imports/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/imports/CMakeLists.txt	2015-10-26 15:55:17 +0000
@@ -0,0 +1,5 @@
+
+#
+# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
+#
+add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

=== added file 'tests/imports/check_imports.py'
--- tests/imports/check_imports.py	1970-01-01 00:00:00 +0000
+++ tests/imports/check_imports.py	2015-10-26 15:55:17 +0000
@@ -0,0 +1,125 @@
+#! /usr/bin/env python3
+
+#
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# 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 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/>.
+#
+
+#
+# Little helper program to test that all source files import
+# versions we want
+#
+# Usage: check_imports.py directory [ignore_prefix]
+#
+# The directory specifies the (recursive) location of the source files. Any
+# files with a path that starts with ignore_prefix are not checked. This is
+# useful to exclude files that are generated into the build directory.
+#
+# See the file_pat definition below for a list of files that are checked.
+#
+
+from __future__ import print_function
+
+import argparse
+import os
+import re
+import sys
+
+
+# Print msg on stderr, preceded by program name and followed by newline
+def error(msg):
+    print(os.path.basename(sys.argv[0]) + ": " + msg, file=sys.stderr)
+
+
+# Function to raise errors encountered by os.walk
+def raise_error(e):
+    raise e
+
+# Qt Quick patterns
+# If you increase this make sure you increase
+# the Qt version in debian/control and in CMakeLists.txt
+quick_pat = re.compile(r'.*import QtQuick.*$')
+quick_good_pat = re.compile(r'.*import QtQuick 2\.4.*$')
+quick_layouts_good_pat = re.compile(r'.*import QtQuick.Layouts 1\.1.*$')
+quick_window_good_pat = re.compile(r'.*import QtQuick.Window 2\.2.*$')
+
+# Ubuntu Components patterns
+ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')
+ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.3.*')
+
+def scan_for_bad_import(file_path, all_pat, good_pats):
+    errors = []
+    with open(file_path, 'rt', encoding='utf-8') as ifile:
+        for lino, line in enumerate(ifile, start=1):
+            if all_pat.match(line):
+                good_found = False
+                for good_pat in good_pats:
+                    if good_pat.match(line):
+                        good_found = True
+                if not good_found:
+                    errors.append(lino)
+    if 0 < len(errors) <= 10:
+        if len(errors) > 1:
+            plural = 's'
+        else:
+            plural = ''
+        print(
+            "%s: bad import version in line%s %s" % (
+                file_path, plural, ", ".join((str(i) for i in errors))))
+    elif errors:
+        print("%s: bad import version in multiple lines" % file_path)
+    return bool(errors)
+
+# Parse args
+
+parser = argparse.ArgumentParser(
+    description='Test that source files contain the wanted import version.')
+parser.add_argument(
+    'dir', nargs=1,
+    help='The directory to (recursively) search for source files')
+parser.add_argument(
+    'ignore_prefix', nargs='?', default=None,
+    help='Ignore source files with a path that starts with the given prefix.')
+args = parser.parse_args()
+
+# Files we want to check for import version.
+
+file_pat = (
+    r'(.*\.(js|qml)$)')
+pat = re.compile(file_pat)
+
+# Find all the files with matching file extension in the specified
+# directory and check them
+
+directory = os.path.abspath(args.dir[0])
+ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
+
+found_bad_import = False
+try:
+    for root, dirs, files in os.walk(directory, onerror=raise_error):
+        for file in files:
+            path = os.path.join(root, file)
+            if not (ignore and path.startswith(ignore)) and pat.match(file):
+                quick_good_pats = [quick_good_pat, quick_layouts_good_pat, quick_window_good_pat]
+                if scan_for_bad_import(path, quick_pat, quick_good_pats):
+                    found_bad_import = True
+                if scan_for_bad_import(path, ubuntu_components_pat, [ubuntu_good_components_pat]):
+                    found_bad_import = True
+
+except OSError as e:
+    error("cannot create file list for \"" + dir + "\": " + e.strerror)
+    sys.exit(1)
+
+if found_bad_import:
+    sys.exit(1)

=== modified file 'tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml'
--- tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml	2015-02-19 21:34:08 +0000
+++ tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import MeeGo.QOfono 0.2
 
 Item {

=== modified file 'tests/mocks/QMenuModel/QDBusActionGroup.qml'
--- tests/mocks/QMenuModel/QDBusActionGroup.qml	2015-07-01 11:24:42 +0000
+++ tests/mocks/QMenuModel/QDBusActionGroup.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Settings.Menus 0.1 as Menus
 import QMenuModel 0.1
 
@@ -34,7 +34,7 @@
 
     function action(actionName) {
         return Qt.createQmlObject("
-            import QtQuick 2.3
+            import QtQuick 2.4
             import QMenuModel 0.1
 
             QtObject {

=== modified file 'tests/mocks/QMenuModel/UnityMenuAction.qml'
--- tests/mocks/QMenuModel/UnityMenuAction.qml	2013-10-14 11:21:11 +0000
+++ tests/mocks/QMenuModel/UnityMenuAction.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *   Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QMenuModel 0.1
 
 QtObject {

=== modified file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml'
--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	2014-11-24 19:51:51 +0000
+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 
 Item {
     property var languageNames: ["English", "French", "Spanish"]

=== modified file 'tests/mocks/Ubuntu/Web/WebView.qml'
--- tests/mocks/Ubuntu/Web/WebView.qml	2015-05-01 14:34:56 +0000
+++ tests/mocks/Ubuntu/Web/WebView.qml	2015-10-26 15:55:17 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     property url url

=== modified file 'tests/mocks/Unity/Application/resources/MirSurfaceItem.qml'
--- tests/mocks/Unity/Application/resources/MirSurfaceItem.qml	2015-09-02 08:04:41 +0000
+++ tests/mocks/Unity/Application/resources/MirSurfaceItem.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Rectangle {
     id: root

=== modified file 'tests/mocks/Unity/Application/resources/VirtualKeyboard.qml'
--- tests/mocks/Unity/Application/resources/VirtualKeyboard.qml	2015-06-22 10:08:38 +0000
+++ tests/mocks/Unity/Application/resources/VirtualKeyboard.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Unity.Application 0.1
 
 Item {

=== modified file 'tests/mocks/Unity/Indicators/ActionRootState.qml'
--- tests/mocks/Unity/Indicators/ActionRootState.qml	2014-11-11 10:45:41 +0000
+++ tests/mocks/Unity/Indicators/ActionRootState.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 QtObject {
     property var actionGroup

=== modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
--- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2014-10-17 14:55:35 +0000
+++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Unity.Indicators 0.1 as Indicators
 
 Indicators.FakeIndicatorsModel {

=== modified file 'tests/mocks/Unity/Indicators/ModelActionRootState.qml'
--- tests/mocks/Unity/Indicators/ModelActionRootState.qml	2014-11-11 15:28:13 +0000
+++ tests/mocks/Unity/Indicators/ModelActionRootState.qml	2015-10-26 15:55:17 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     property var menu: null

=== modified file 'tests/mocks/Utils/HomeKeyWatcher.qml'
--- tests/mocks/Utils/HomeKeyWatcher.qml	2015-05-06 11:22:18 +0000
+++ tests/mocks/Utils/HomeKeyWatcher.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 QtObject {
     signal activated()

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2015-10-26 15:55:17 +0000
@@ -87,7 +87,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2015-10-26 15:55:17 +0000
@@ -88,7 +88,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -108,7 +108,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2015-10-26 15:55:17 +0000
@@ -87,7 +87,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -107,7 +107,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2015-10-26 15:55:17 +0000
@@ -72,7 +72,7 @@
                     wrapMode: Text.Wrap; 
                     maximumLineCount: 2; 
                     font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                    color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                     visible: showHeader ; 
                     width: undefined;
                     text: root.title; 
@@ -92,7 +92,7 @@
                         maximumLineCount: 1; 
                         fontSize: "x-small"; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
+                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
                         visible: titleLabel.visible && titleLabel.text; 
                         text: cardData && cardData["subtitle"] || ""; 
                         font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2015-10-26 15:55:17 +0000
@@ -131,7 +131,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader && overlayLoader.active; 
                         width: undefined;
                         text: root.title; 
@@ -152,7 +152,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 

=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2015-10-26 15:55:17 +0000
@@ -67,7 +67,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -87,7 +87,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -101,7 +101,7 @@
                             rightMargin: units.gu(1); 
                             } 
                             source: cardData && cardData["emblem"] || ""; 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             height: source != "" ? titleLabel.font.pixelSize : 0; 
                             width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
                         }

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2015-10-26 15:55:17 +0000
@@ -89,7 +89,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                         visible: showHeader ; 
                         width: undefined;
                         text: root.title; 
@@ -109,7 +109,7 @@
                             maximumLineCount: 1; 
                             fontSize: "x-small"; 
                             font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             visible: titleLabel.visible && titleLabel.text; 
                             text: cardData && cardData["subtitle"] || ""; 
                             font.weight: Font.Light; 
@@ -122,7 +122,7 @@
                             rightMargin: units.gu(1);
                             top: subtitleLabel.bottom; 
                             } 
-                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
                             fontScale: root.fontScale; 
                             model: cardData && cardData["attributes"]; 
                           }

=== modified file 'tests/plugins/Dash/cardcreator/8.res'
--- tests/plugins/Dash/cardcreator/8.res	2015-06-22 08:29:55 +0000
+++ tests/plugins/Dash/cardcreator/8.res	2015-10-26 15:55:17 +0000
@@ -80,7 +80,7 @@
                         wrapMode: Text.Wrap; 
                         maximumLineCount: 2; 
                         font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
-                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white"); 
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
                         visible: showHeader ; 
                         width: parent.width - x; 
                         text: root.title; 

=== modified file 'tests/plugins/Dash/cardcreatortest.qml'
--- tests/plugins/Dash/cardcreatortest.qml	2014-05-06 10:06:54 +0000
+++ tests/plugins/Dash/cardcreatortest.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import "../../../plugins/Dash/CardCreator.js" as CardCreator
 
 Item {

=== modified file 'tests/plugins/Dash/horizontaljournaltest.qml'
--- tests/plugins/Dash/horizontaljournaltest.qml	2014-11-17 11:38:07 +0000
+++ tests/plugins/Dash/horizontaljournaltest.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/Dash/horizontaljournaltry.qml'
--- tests/plugins/Dash/horizontaljournaltry.qml	2014-06-05 10:29:32 +0000
+++ tests/plugins/Dash/horizontaljournaltry.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
--- tests/plugins/Dash/listviewwithpageheadertest.qml	2014-08-26 08:41:02 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsection.qml'
--- tests/plugins/Dash/listviewwithpageheadertestsection.qml	2014-08-26 08:41:02 +0000
+++ tests/plugins/Dash/listviewwithpageheadertestsection.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml'
--- tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2014-08-26 08:41:02 +0000
+++ tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/organicgridtest.qml'
--- tests/plugins/Dash/organicgridtest.qml	2014-11-17 11:42:04 +0000
+++ tests/plugins/Dash/organicgridtest.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/Dash/organicgridtry.qml'
--- tests/plugins/Dash/organicgridtry.qml	2014-06-05 10:29:32 +0000
+++ tests/plugins/Dash/organicgridtry.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/Dash/tst_CardAttributes.qml'
--- tests/plugins/Dash/tst_CardAttributes.qml	2014-08-16 10:23:30 +0000
+++ tests/plugins/Dash/tst_CardAttributes.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Dash 0.1
 

=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-08-31 13:29:42 +0000
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtTest 1.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Dash 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml'
--- tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml	2014-07-23 08:45:47 +0000
+++ tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Dash 0.1
 

=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml	2014-11-20 11:44:44 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtTest 1.0
 import Dash 0.1
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Utils 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Dash/verticaljournaltest.qml'
--- tests/plugins/Dash/verticaljournaltest.qml	2014-11-17 12:14:05 +0000
+++ tests/plugins/Dash/verticaljournaltest.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/Dash/verticaljournaltry.qml'
--- tests/plugins/Dash/verticaljournaltry.qml	2014-06-05 10:29:32 +0000
+++ tests/plugins/Dash/verticaljournaltry.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Dash 0.1
 
 Item {

=== modified file 'tests/plugins/IntegratedLightDM/greeter.qml'
--- tests/plugins/IntegratedLightDM/greeter.qml	2015-07-16 20:56:01 +0000
+++ tests/plugins/IntegratedLightDM/greeter.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import IntegratedLightDM 0.1 as LightDM
 
 Item {

=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
 

=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     objectName: "rightwardsLauncher"

=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-10-26 15:55:17 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.3
 
 Item {
     id: root

=== modified file 'tests/plugins/Ubuntu/Gestures/empty.qml'
--- tests/plugins/Ubuntu/Gestures/empty.qml	2014-10-20 20:50:02 +0000
+++ tests/plugins/Ubuntu/Gestures/empty.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
 
 Item {

=== modified file 'tests/plugins/Ubuntu/Gestures/touchGateExample.qml'
--- tests/plugins/Ubuntu/Gestures/touchGateExample.qml	2014-10-01 13:20:32 +0000
+++ tests/plugins/Ubuntu/Gestures/touchGateExample.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Gestures 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Unity.Test 0.1
 
 Rectangle {

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-05-27 09:37:34 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 import Unity.Test 0.1
 

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2013-11-22 13:43:40 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2015-10-26 15:55:17 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Gestures 0.1
 
 /*

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp	2015-05-21 15:52:48 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp	2015-10-26 15:55:17 +0000
@@ -19,9 +19,7 @@
 #include <QQmlEngine>
 #include <QQuickView>
 #include <QSharedPointer>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-    #include <private/qquickwindow_p.h>
-#endif
+#include <private/qquickwindow_p.h>
 
 // C++ std lib
 #include <functional>
@@ -188,10 +186,8 @@
 
     if (!ownershipAfterTouchEnd) {
         touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
         QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());
         wp->flushDelayedTouchEvent();
-#endif
         // TouchGate should now open its flood gates and let testItem get all
         // events from touch 0 produced so far
         QCOMPARE(testItem->touchEventsReceived.count(), 2);

=== modified file 'tests/plugins/Utils/tst_UtilsStyle.qml'
--- tests/plugins/Utils/tst_UtilsStyle.qml	2014-08-14 11:43:32 +0000
+++ tests/plugins/Utils/tst_UtilsStyle.qml	2015-10-26 15:55:17 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtTest 1.0
 import Utils 0.1
 

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-10-20 08:10:03 +0000
+++ tests/qmltests/CMakeLists.txt	2015-10-26 15:55:17 +0000
@@ -26,7 +26,7 @@
 add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
 add_unity8_qmltest(Dash CardTool)
 add_unity8_qmltest(Dash GenericScopeView)
-add_unity8_qmltest(Dash PageHeader)
+add_unity8_qmltest(Dash DashPageHeader)
 add_unity8_qmltest(Dash PreviewListView)
 add_unity8_qmltest(Dash/Previews Preview)
 add_unity8_qmltest(Dash/Previews PreviewActions)