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

[Albert Astals Cid]

Move to importing QtQuick 2.4 & friends

This means we obviously require Qt 5.4 or greater, we had for a while
but make it official now

 * 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?
There's changes but i don't think we need to subscribe them

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1996
http://jenkins.qa.ubuntu.com/job/unity8-ci/6406/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1118
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/646
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23886
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23887

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/use_sdk_12_quick_24]

1997. By Albert Astals Cid on 2015-10-02

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1997
http://jenkins.qa.ubuntu.com/job/unity8-ci/6409/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4475
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23900
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/788
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/788/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23899

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/use_sdk_12_quick_24]

1998. By Albert Astals Cid on 2015-10-08

Merge

1999. By Albert Astals Cid on 2015-10-08

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1998
http://jenkins.qa.ubuntu.com/job/unity8-ci/6427/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4545
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/667
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24055
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24056

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1999
http://jenkins.qa.ubuntu.com/job/unity8-ci/6430/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4550
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/670
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24064
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24065

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Going for SDK 1.3 directly after all.

review: Disapprove

Unmerged revisions

1999. By Albert Astals Cid on 2015-10-08

Merge

1998. By Albert Astals Cid on 2015-10-08

Merge

1997. By Albert Astals Cid on 2015-10-02

Merge

1996. By Albert Astals Cid on 2015-10-02

Move to importing QtQuick 2.4 & friends

This means we obviously require Qt 5.4 or greater, we had for a while
but make it official now

1995. By Albert Astals Cid on 2015-10-02

Use SDK 1.2 all over the board

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-30 16:49:52 +0000
+++ CMakeLists.txt	2015-10-08 09:07:28 +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>=8)
 

=== modified file 'debian/control'
--- debian/control	2015-09-23 18:15:40 +0000
+++ debian/control	2015-10-08 09:07:28 +0000
@@ -41,12 +41,12 @@
                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.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),

=== modified file 'plugins/Dash/CardAttributes.qml'
--- plugins/Dash/CardAttributes.qml	2015-10-08 09:07:28 +0000
+++ plugins/Dash/CardAttributes.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2015-10-08 09:07:28 +0000
+++ plugins/Dash/CardCreator.js	2015-10-08 09:07:28 +0000
@@ -697,7 +697,7 @@
 }
 
 function createCardComponent(parent, template, components) {
-    var imports = 'import QtQuick 2.2; \n\
+    var imports = 'import QtQuick 2.4; \n\
                    import Ubuntu.Components 1.2; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
                    import Dash 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-08 09:07:28 +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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ plugins/Dash/ScopeStyle.qml	2015-10-08 09:07:28 +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 Utils 0.1
 import Ubuntu.Components 1.2
 

=== modified file 'plugins/Dash/abstractdashview.h'
--- plugins/Dash/abstractdashview.h	2014-12-03 10:28:53 +0000
+++ plugins/Dash/abstractdashview.h	2015-10-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Components/Background.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Utils 0.1 as Utils
 

=== modified file 'qml/Components/BaseCarouselDelegate.qml'
--- qml/Components/BaseCarouselDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/BaseCarouselDelegate.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 /*!

=== modified file 'qml/Components/Carousel.qml'
--- qml/Components/Carousel.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/Carousel.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "carousel.js" as CarouselJS
 

=== modified file 'qml/Components/Circle.qml'
--- qml/Components/Circle.qml	2013-06-05 22:03:08 +0000
+++ qml/Components/Circle.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/DelayedLockscreen.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/Dialogs.qml	2015-10-08 09:07:28 +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
 import Unity.Session 0.1

=== modified file 'qml/Components/DragHandle.qml'
--- qml/Components/DragHandle.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/DragHandle.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 

=== modified file 'qml/Components/DraggingArea.qml'
--- qml/Components/DraggingArea.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/DraggingArea.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 MouseArea {

=== modified file 'qml/Components/EdgeDragEvaluator.qml'
--- qml/Components/EdgeDragEvaluator.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/EdgeDragEvaluator.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/InputMethod.qml	2015-10-08 09:07:28 +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
 import Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1

=== modified file 'qml/Components/LazyImage.qml'
--- qml/Components/LazyImage.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/LazyImage.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Components/ListItems/Header.qml'
--- qml/Components/ListItems/Header.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/ListItems/Header.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 

=== 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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/Lockscreen.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.Popups 1.2
 import Ubuntu.Telephony 0.1 as Telephony

=== 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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/PassphraseLockscreen.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Components/PhysicalKeysMapper.qml'
--- qml/Components/PhysicalKeysMapper.qml	2015-09-02 09:30:32 +0000
+++ qml/Components/PhysicalKeysMapper.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/PinLockscreen.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2
 import "../Components"

=== modified file 'qml/Components/PinPadButton.qml'
--- qml/Components/PinPadButton.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/PinPadButton.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 AbstractButton {

=== modified file 'qml/Components/Rating.qml'
--- qml/Components/Rating.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/Rating.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 /*! Rating widget bar. */

=== modified file 'qml/Components/RatingStyle.qml'
--- qml/Components/RatingStyle.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/RatingStyle.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Row {

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/ResponsiveGridView.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 /*

=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
--- qml/Components/ResponsiveVerticalJournal.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 import Dash 0.1

=== modified file 'qml/Components/ScreenGrabber.qml'
--- qml/Components/ScreenGrabber.qml	2015-08-24 15:39:53 +0000
+++ qml/Components/ScreenGrabber.qml	2015-10-08 09:07:28 +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 QtMultimedia 5.0
 import ScreenGrabber 0.1
 import GlobalShortcut 1.0

=== modified file 'qml/Components/ScrollCalculator.qml'
--- qml/Components/ScrollCalculator.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/ScrollCalculator.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== 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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/ShellDialog.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.Popups 1.2

=== modified file 'qml/Components/Showable.qml'
--- qml/Components/Showable.qml	2014-12-08 12:21:11 +0000
+++ qml/Components/Showable.qml	2015-10-08 09:07:28 +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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Components/UbuntuShapeForItem.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more

=== modified file 'qml/Components/Unity8Settings.qml'
--- qml/Components/Unity8Settings.qml	2015-06-19 18:19:33 +0000
+++ qml/Components/Unity8Settings.qml	2015-10-08 09:07:28 +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-08 09:07:28 +0000
@@ -16,7 +16,7 @@
 
 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

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2015-10-08 09:07:28 +0000
+++ qml/Components/WindowControlButtons.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 
 Row {

=== modified file 'qml/Components/WindowScreenshot.qml'
--- qml/Components/WindowScreenshot.qml	2015-03-06 04:44:11 +0000
+++ qml/Components/WindowScreenshot.qml	2015-10-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Components/ZoomableImage.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Dash/CardCarousel.qml'
--- qml/Dash/CardCarousel.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/CardCarousel.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2015-05-13 10:21:18 +0000
+++ qml/Dash/CardGrid.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Dash/CardHorizontalList.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Dash/CardTool.qml'
--- qml/Dash/CardTool.qml	2015-09-01 08:38:39 +0000
+++ qml/Dash/CardTool.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Dash/CardVerticalJournal.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Dash.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 import Unity 0.2

=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashApplication.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 

=== modified file 'qml/Dash/DashBackground.qml'
--- qml/Dash/DashBackground.qml	2015-04-13 18:28:54 +0000
+++ qml/Dash/DashBackground.qml	2015-10-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashCategoryBase.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashContent.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity 0.2
 import Utils 0.1

=== modified file 'qml/Dash/DashNavigation.qml'
--- qml/Dash/DashNavigation.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashNavigation.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Dash 0.1
 import "../Components"

=== modified file 'qml/Dash/DashNavigationButton.qml'
--- qml/Dash/DashNavigationButton.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashNavigationButton.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 AbstractButton {

=== modified file 'qml/Dash/DashNavigationList.qml'
--- qml/Dash/DashNavigationList.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/DashNavigationList.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 import "../Components"

=== modified file 'qml/Dash/DashRenderer.qml'
--- qml/Dash/DashRenderer.qml	2015-01-14 09:51:39 +0000
+++ qml/Dash/DashRenderer.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Dash/GenericScopeView.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Utils 0.1
 import Unity 0.2

=== modified file 'qml/Dash/PageHeader.qml'
--- qml/Dash/PageHeader.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/PageHeader.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.Themes.Ambiance 1.2
 import Ubuntu.Components.Popups 1.2

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/PreviewListView.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity 0.2
 import "../Components"

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/Preview.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 /*! \brief This component constructs the Preview UI.

=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
--- qml/Dash/Previews/PreviewActionButton.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewActionButton.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Button {

=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 /*! This preview widget shows either one button, two buttons or one button

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2015-10-08 09:07:28 +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 QtMultimedia 5.0
 import Ubuntu.Components 1.2
 

=== 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-08 09:07:28 +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.Components 1.2
 
 /*! \brief Preview widget for comments.

=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
--- qml/Dash/Previews/PreviewCommentInput.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewCommentInput.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
--- qml/Dash/Previews/PreviewExpandable.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewExpandable.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Dash 0.1
 import "../"

=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
--- qml/Dash/Previews/PreviewIconActions.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewIconActions.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 /*! This preview widget icons+label for number of items in widgetData["actions"].

=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
--- qml/Dash/Previews/PreviewImageGallery.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewImageGallery.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
--- qml/Dash/Previews/PreviewOverlay.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewOverlay.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
--- qml/Dash/Previews/PreviewPayments.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewPayments.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Payments 0.1
 

=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
--- qml/Dash/Previews/PreviewProgress.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewProgress.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.DownloadDaemonListener 0.1
 

=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
--- qml/Dash/Previews/PreviewRatingInput.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewTable.qml'
--- qml/Dash/Previews/PreviewTable.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewTable.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import "../../Components"

=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
--- qml/Dash/Previews/PreviewTextSummary.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewTextSummary.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-10-08 09:07:28 +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.Components 1.2
 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-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../Components"
 

=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
--- qml/Dash/PullToRefreshScopeStyle.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/PullToRefreshScopeStyle.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.Styles 1.2
 

=== modified file 'qml/Dash/ScopeListView.qml'
--- qml/Dash/ScopeListView.qml	2014-12-03 11:06:10 +0000
+++ qml/Dash/ScopeListView.qml	2015-10-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 /*! Interface for settings widgets. */

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 

=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 

=== 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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 

=== 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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopeSettingsPage.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity 0.2
 import "../Components"

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-07-08 09:55:58 +0000
+++ qml/Dash/ScopesList.qml	2015-10-08 09:07:28 +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 {

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopesListCategory.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Dash 0.1
 import "../Components/ListItems" as ListItems

=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
--- qml/Dash/ScopesListCategoryItem.qml	2015-10-08 09:07:28 +0000
+++ qml/Dash/ScopesListCategoryItem.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 

=== modified file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	2015-07-01 17:52:34 +0000
+++ qml/DeviceConfiguration.qml	2015-10-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Greeter/Clock.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Panel/Indicators"
 import Unity.Indicators 0.1 as Indicators

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2015-10-08 09:07:28 +0000
+++ qml/Greeter/CoverPage.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Greeter/Greeter.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import GSettings 1.0
 import Ubuntu.Components 1.2

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2015-10-08 09:07:28 +0000
+++ qml/Greeter/Infographics.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
 
 import "../Components"
 import "Gradient.js" as Gradient
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
--- qml/Greeter/IntegratedLightDMImpl.qml	2015-06-06 02:23:50 +0000
+++ qml/Greeter/IntegratedLightDMImpl.qml	2015-10-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Greeter/LoginList.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-10-08 09:07:28 +0000
+++ qml/Greeter/NarrowView.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Greeter/ObjectPositioner.qml'
--- qml/Greeter/ObjectPositioner.qml	2015-10-08 09:07:28 +0000
+++ qml/Greeter/ObjectPositioner.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Greeter/ShimGreeter.qml'
--- qml/Greeter/ShimGreeter.qml	2015-04-22 23:55:23 +0000
+++ qml/Greeter/ShimGreeter.qml	2015-10-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Greeter/WideView.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 FocusScope {

=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
--- qml/Launcher/FoldingLauncherDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Launcher/FoldingLauncherDelegate.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 LauncherDelegate {

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2015-10-08 09:07:28 +0000
+++ qml/Launcher/Launcher.qml	2015-10-08 09:07:28 +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"
 import Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Launcher/LauncherDelegate.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2015-10-08 09:07:28 +0000
+++ qml/Launcher/LauncherPanel.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItems
 import Unity.Launcher 0.1

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-10-08 09:07:28 +0000
+++ qml/Notifications/Notification.qml	2015-10-08 09:07:28 +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 QtMultimedia 5.0
 import Powerd 0.1
 import Ubuntu.Components 1.2

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2015-10-08 09:07:28 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-10-08 09:07:28 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import QMenuModel 0.1
 import "../Components"

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2015-10-08 09:07:28 +0000
+++ qml/Notifications/Notifications.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity.Notifications 1.0 as UnityNotifications
 import Utils 0.1

=== modified file 'qml/Notifications/OptionToggle.qml'
--- qml/Notifications/OptionToggle.qml	2015-10-08 09:07:28 +0000
+++ qml/Notifications/OptionToggle.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 import Ubuntu.Components.Popups 1.2

=== modified file 'qml/Notifications/ShapedIcon.qml'
--- qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:26 +0000
+++ qml/Notifications/ShapedIcon.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Notifications/SwipeToAct.qml'
--- qml/Notifications/SwipeToAct.qml	2015-09-22 14:39:02 +0000
+++ qml/Notifications/SwipeToAct.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-09-22 14:23:44 +0000
+++ qml/OrientedShell.qml	2015-10-08 09:07:28 +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"

=== modified file 'qml/Panel/ActiveCallHint.qml'
--- qml/Panel/ActiveCallHint.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/ActiveCallHint.qml	2015-10-08 09:07:28 +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.Telephony 0.1 as Telephony
 import Ubuntu.Components 1.2
 import Unity.Application 0.1

=== modified file 'qml/Panel/Handle.qml'
--- qml/Panel/Handle.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Handle.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Rectangle {

=== modified file 'qml/Panel/IndicatorItem.qml'
--- qml/Panel/IndicatorItem.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/IndicatorItem.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Settings.Components 0.1
 import "Indicators"

=== modified file 'qml/Panel/IndicatorItemRow.qml'
--- qml/Panel/IndicatorItemRow.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/IndicatorItemRow.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 Item {

=== modified file 'qml/Panel/IndicatorPage.qml'
--- qml/Panel/IndicatorPage.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/IndicatorPage.qml	2015-10-08 09:07:28 +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.Components 1.2 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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-10-08 09:07:28 +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.Settings.Menus 0.1 as Menus
 import Ubuntu.Settings.Components 0.1
 import QMenuModel 0.1

=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-10-08 09:07:28 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 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	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/ModemInfoItem.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem

=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
--- qml/Panel/Indicators/RoamingIndication.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/RoamingIndication.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 

=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-10-08 09:07:28 +0000
@@ -18,7 +18,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 import "../.."

=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-10-08 09:07:28 +0000
@@ -17,7 +17,7 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 

=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
--- qml/Panel/Indicators/client/IndicatorsList.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2015-10-08 09:07:28 +0000
@@ -17,7 +17,7 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 import Unity.Indicators 0.1 as Indicators

=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2015-10-08 09:07:28 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Unity.Indicators 0.1 as Indicators
 import ".."

=== modified file 'qml/Panel/IndicatorsBar.qml'
--- qml/Panel/IndicatorsBar.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/IndicatorsBar.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../Components"
 

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 import "../Components"

=== modified file 'qml/Panel/MenuContent.qml'
--- qml/Panel/MenuContent.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/MenuContent.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import Unity.Indicators 0.1 as Indicators

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-10-08 09:07:28 +0000
+++ qml/Panel/Panel.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity.Application 0.1
 import "../Components"

=== modified file 'qml/Panel/PanelBackground.qml'
--- qml/Panel/PanelBackground.qml	2013-06-05 22:03:08 +0000
+++ qml/Panel/PanelBackground.qml	2015-10-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +0000
+++ qml/Rotation/RotationStates.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Powerd 0.1
 

=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2015-10-08 09:07:28 +0000
+++ qml/ScopeTool.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.Popups 1.2
 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-08 09:07:28 +0000
+++ qml/Shell.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import GSettings 1.0
 import Unity.Application 0.1

=== 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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-10-08 09:07:28 +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.Components 1.2
 
 BaseSessionAnimation {

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity.Application 0.1
 

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Unity.Application 0.1
 

=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
--- qml/Stages/DesktopSpreadDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/DesktopSpreadDelegate.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Unity.Application 0.1
 

=== modified file 'qml/Stages/MainViewStyle.qml'
--- qml/Stages/MainViewStyle.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/MainViewStyle.qml	2015-10-08 09:07:28 +0000
@@ -13,7 +13,7 @@
  * 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 QtQuick 2.4
 import Ubuntu.Components 1.2
 
 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme

=== modified file 'qml/Stages/OrientationChangeAnimation.qml'
--- qml/Stages/OrientationChangeAnimation.qml	2015-04-24 09:53:37 +0000
+++ qml/Stages/OrientationChangeAnimation.qml	2015-10-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ qml/Stages/PageHeadStyle.qml	2015-10-08 09:07:28 +0000
@@ -13,7 +13,7 @@
  * 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 QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.Styles 1.2 as Style
 

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/PhoneStage.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 import Unity.Application 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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ qml/Stages/ShimStage.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Rectangle {

=== modified file 'qml/Stages/Splash.qml'
--- qml/Stages/Splash.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/Splash.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Components.Themes 0.1
 import "../Components"
@@ -64,7 +64,7 @@
         // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
         property var theme: QtObject {
             property string name
-            property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
+            property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
                                                           import Ubuntu.Components.Themes.%1 1.2;\
                                                           Palette {}".arg(styledItem.theme.name),
                                                          styledItem, "dynamicPalette");

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-10-08 09:07:28 +0000
@@ -17,8 +17,8 @@
  *          Daniel d'Andrada <[e-mail]>
  */
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Stages/SpreadMaths.qml'
--- qml/Stages/SpreadMaths.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/SpreadMaths.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Utils 0.1
 

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1 // For TouchGate
 import Utils 0.1 // for InputWatcher

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/TabletStage.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1

=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
--- qml/Stages/TransformedSpreadDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/TransformedSpreadDelegate.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Utils 0.1
 import Ubuntu.Components 1.2
 

=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Utils 0.1
 import Ubuntu.Components 1.2
 import Unity.Application 0.1

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/WindowDecoration.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Stages/WindowMoveResizeArea.qml'
--- qml/Stages/WindowMoveResizeArea.qml	2015-10-08 09:07:28 +0000
+++ qml/Stages/WindowMoveResizeArea.qml	2015-10-08 09:07:28 +0000
@@ -16,7 +16,7 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Utils 0.1
 

=== modified file 'qml/Tutorial/Arrow.qml'
--- qml/Tutorial/Arrow.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/Arrow.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Tutorial/Slider.qml'
--- qml/Tutorial/Slider.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/Slider.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Tutorial/Tick.qml'
--- qml/Tutorial/Tick.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/Tick.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 MouseArea {

=== modified file 'qml/Tutorial/Tutorial.qml'
--- qml/Tutorial/Tutorial.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/Tutorial.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Tutorial/TutorialBottom.qml'
--- qml/Tutorial/TutorialBottom.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialBottom.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1
 import "../Components"

=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
--- qml/Tutorial/TutorialBottomFinish.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialBottomFinish.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "." as LocalComponents
 

=== modified file 'qml/Tutorial/TutorialContent.qml'
--- qml/Tutorial/TutorialContent.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialContent.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "." as LocalComponents
 

=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
--- qml/Tutorial/TutorialLeftFinish.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialLeftFinish.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "." as LocalComponents
 

=== modified file 'qml/Tutorial/TutorialPage.qml'
--- qml/Tutorial/TutorialPage.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialPage.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'qml/Tutorial/TutorialRight.qml'
--- qml/Tutorial/TutorialRight.qml	2015-10-08 09:07:28 +0000
+++ qml/Tutorial/TutorialRight.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1

=== modified file 'qml/Wizard/CheckableSetting.qml'
--- qml/Wizard/CheckableSetting.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/CheckableSetting.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem
 

=== modified file 'qml/Wizard/Page.qml'
--- qml/Wizard/Page.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Page.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 Item {

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Wizard 0.1

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2
 import Ubuntu.SystemSettings.LanguagePlugin 1.0

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- qml/Wizard/Pages/20-sim.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/20-sim.qml	2015-10-08 09:07:28 +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 MeeGo.QOfono 0.2
 import Ubuntu.Components 1.2
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- qml/Wizard/Pages/30-passwd-type.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- qml/Wizard/Pages/40-wifi.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2015-10-08 09:07:28 +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 QMenuModel 0.1 as QMenuModel
 import QtSystemInfo 5.0
 import Ubuntu.Components 1.2

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- qml/Wizard/Pages/50-location.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/50-location.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import QMenuModel 0.1 as QMenuModel
 import Qt.labs.folderlistmodel 2.1

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- qml/Wizard/Pages/60-reporting.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Ubuntu.SystemSettings.Diagnostics 1.0
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- qml/Wizard/Pages/80-finished.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/80-finished.qml	2015-10-08 09:07:28 +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.Components 1.2
 import ".." as LocalComponents
 

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- qml/Wizard/Pages/here-terms.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/here-terms.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components 1.2

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- qml/Wizard/Pages/passwd-confirm.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- qml/Wizard/Pages/passwd-set.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import ".." as LocalComponents

=== modified file 'qml/Wizard/StackButton.qml'
--- qml/Wizard/StackButton.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/StackButton.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 
 AbstractButton {

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2015-10-08 09:07:28 +0000
+++ qml/Wizard/Wizard.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Wizard 0.1
 import "../Components"

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-10-08 09:07:28 +0000
+++ tests/CMakeLists.txt	2015-10-08 09:07:28 +0000
@@ -132,4 +132,4 @@
 add_subdirectory(plugins)
 add_subdirectory(qmltests)
 add_subdirectory(whitespace)
-add_subdirectory(sdk)
+add_subdirectory(imports)

=== renamed directory 'tests/sdk' => 'tests/imports'
=== modified file 'tests/imports/CMakeLists.txt'
--- tests/sdk/CMakeLists.txt	2015-10-08 09:07:28 +0000
+++ tests/imports/CMakeLists.txt	2015-10-08 09:07:28 +0000
@@ -1,6 +1,6 @@
 
 #
-# Test that all imports for Ubuntu.Components use the wanted version
+# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
 #
 
-add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

=== renamed file 'tests/sdk/check_sdk.py' => 'tests/imports/check_imports.py'
--- tests/sdk/check_sdk.py	2015-10-08 09:07:28 +0000
+++ tests/imports/check_imports.py	2015-10-08 09:07:28 +0000
@@ -15,14 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Authored by: Michi Henning <[e-mail]>
-#
 
 #
 # Little helper program to test that all source files import
-# the wanted SDK version
+# versions we want
 #
-# Usage: check_sdk.py directory [ignore_prefix]
+# 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
@@ -48,38 +46,48 @@
 def raise_error(e):
     raise e
 
-# Scan lines in file_path for bad SDK version. For each file,
-# print the line numbers that have SDK version issues
+# 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\.2.*')
 # Ubuntu.Components.Themes only has 0.1 and 1.3
 # 0.1 is actually 1.2
 ubuntu_good_components_themes_pat = re.compile(r'.*import Ubuntu.Components.Themes 0\.1.*')
 
-def scan_for_bad_sdk(file_path):
-    global ubuntu_components_pat
+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 ubuntu_components_pat.match(line) and not (ubuntu_good_components_pat.match(line) or ubuntu_good_components_themes_pat.match(line)):
-                errors.append(lino)
+            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 SDK Version in line%s %s" % (
+            "%s: bad import version in line%s %s" % (
                 file_path, plural, ", ".join((str(i) for i in errors))))
     elif errors:
-        print("%s: bad SDK Version in multiple lines" % file_path)
+        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 SDK version.')
+    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')
@@ -88,7 +96,7 @@
     help='Ignore source files with a path that starts with the given prefix.')
 args = parser.parse_args()
 
-# Files we want to check for SDK version.
+# Files we want to check for import version.
 
 file_pat = (
     r'(.*\.(js|qml)$)')
@@ -100,18 +108,21 @@
 directory = os.path.abspath(args.dir[0])
 ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
 
-found_bad_sdk = False
+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):
-                if scan_for_bad_sdk(path):
-                    found_bad_sdk = True
+                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, ubuntu_good_components_themes_pat]):
+                    found_bad_import = True
 
 except OSError as e:
     error("cannot create file list for \"" + dir + "\": " + e.strerror)
     sys.exit(1)
 
-if found_bad_sdk:
+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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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/cardcreatortest.qml'
--- tests/plugins/Dash/cardcreatortest.qml	2014-05-06 10:06:54 +0000
+++ tests/plugins/Dash/cardcreatortest.qml	2015-10-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-10-08 09:07:28 +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 QtTest 1.0
 import Ubuntu.Components 1.2
 import Dash 0.1

=== 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-08 09:07:28 +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	2015-10-08 09:07:28 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2015-10-08 09:07:28 +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 Dash 0.1
 import Ubuntu.Components 1.2

=== 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-08 09:07:28 +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-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-10-08 09:07:28 +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
 import Ubuntu.Components 1.2
 

=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-10-08 09:07:28 +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
 import Ubuntu.Components 1.2
 

=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-10-08 09:07:28 +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
 import Ubuntu.Components 1.2
 

=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-10-08 09:07:28 +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
 import Ubuntu.Components 1.2
 

=== 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-08 09:07:28 +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-08 09:07:28 +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-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-10-08 09:07:28 +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.Components 1.2
 import Unity.Test 0.1
 

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-10-08 09:07:28 +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.Components 1.2
 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	2015-10-08 09:07:28 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2015-10-08 09:07:28 +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.Components 1.2
 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-08 09:07:28 +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-08 09:07:28 +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/Components/tst_Background.qml'
--- tests/qmltests/Components/tst_Background.qml	2014-08-14 11:43:47 +0000
+++ tests/qmltests/Components/tst_Background.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1
 

=== modified file 'tests/qmltests/Components/tst_Carousel.qml'
--- tests/qmltests/Components/tst_Carousel.qml	2015-01-09 09:15:45 +0000
+++ tests/qmltests/Components/tst_Carousel.qml	2015-10-08 09:07:28 +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 "../../../qml/Components/"
 import "../../../qml/Components/carousel.js" as Carousel

=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
--- tests/qmltests/Components/tst_Dialogs.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_Dialogs.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1

=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
--- tests/qmltests/Components/tst_DragHandle.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_DragHandle.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 import "tst_DragHandle"
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-10-08 09:07:28 +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 "../../../../qml/Components"
 import Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1

=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-10-08 09:07:28 +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 "../../../../qml/Components"
 import Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1

=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-10-08 09:07:28 +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 "../../../../qml/Components"
 import Ubuntu.Components 1.2
 import Ubuntu.Gestures 0.1

=== modified file 'tests/qmltests/Components/tst_DraggingArea.qml'
--- tests/qmltests/Components/tst_DraggingArea.qml	2013-12-17 16:04:47 +0000
+++ tests/qmltests/Components/tst_DraggingArea.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 

=== modified file 'tests/qmltests/Components/tst_EdgeDragEvaluator.qml'
--- tests/qmltests/Components/tst_EdgeDragEvaluator.qml	2015-04-27 15:30:18 +0000
+++ tests/qmltests/Components/tst_EdgeDragEvaluator.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 
 Item {

=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
--- tests/qmltests/Components/tst_LazyImage.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_LazyImage.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2015-10-08 09:07:28 +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.Components 1.2
 import "../../../../qml/Components"
 

=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
--- tests/qmltests/Components/tst_Lockscreen.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_Lockscreen.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
--- tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2015-09-15 12:05:17 +0000
+++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 import Powerd 0.1

=== modified file 'tests/qmltests/Components/tst_Rating.qml'
--- tests/qmltests/Components/tst_Rating.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_Rating.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Components/tst_Showable.qml'
--- tests/qmltests/Components/tst_Showable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Components/tst_Showable.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
--- tests/qmltests/Components/tst_ZoomableImage.qml	2015-03-18 14:34:18 +0000
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2015-10-08 09:07:28 +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 "../../../qml/Components"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/MockPreviewWidget.qml'
--- tests/qmltests/Dash/Previews/MockPreviewWidget.qml	2014-02-07 09:54:32 +0000
+++ tests/qmltests/Dash/Previews/MockPreviewWidget.qml	2015-10-08 09:07:28 +0000
@@ -15,7 +15,7 @@
  *
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import "../../../../qml/Dash/Previews"
 
 PreviewWidget {

=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2015-03-12 16:08:14 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2015-05-06 15:05:06 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml	2015-05-06 15:05:06 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../../qml/Dash/Previews"

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml	2014-03-03 10:02:43 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-21 07:22:23 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2015-10-08 09:07:28 +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 "../../../../qml/Dash/Previews"
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"

=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import "../../../../qml/Dash/ScopeSettings"

=== modified file 'tests/qmltests/Dash/tst_Card.qml'
--- tests/qmltests/Dash/tst_Card.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_Card.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/tst_CardBenchmark.qml'
--- tests/qmltests/Dash/tst_CardBenchmark.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_CardBenchmark.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
--- tests/qmltests/Dash/tst_CardTool.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_CardTool.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2015-10-08 09:07:28 +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 "../../../qml/Dash"
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2015-10-08 09:07:28 +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 "../../../qml/Dash"
 import "../../../qml/Components"

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-10-08 09:07:28 +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 Unity 0.2
 import ".."

=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
--- tests/qmltests/Dash/tst_PageHeader.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_PageHeader.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Dash"

=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
--- tests/qmltests/Dash/tst_PreviewListView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Dash/tst_PreviewListView.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../../../qml/Dash"

=== modified file 'tests/qmltests/Greeter/TestView.qml'
--- tests/qmltests/Greeter/TestView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/TestView.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import "../Components"
 

=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
--- tests/qmltests/Greeter/tst_Clock.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/tst_Clock.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Greeter"

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Greeter"

=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/tst_Infographics.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Greeter"

=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
--- tests/qmltests/Greeter/tst_NarrowView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Greeter"

=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
--- tests/qmltests/Greeter/tst_WideView.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Greeter/tst_WideView.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Greeter"

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1

=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
--- tests/qmltests/Notifications/tst_OptionToggle.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Notifications/tst_OptionToggle.qml	2015-10-08 09:07:28 +0000
@@ -17,7 +17,7 @@
  *      Mirco Mueller <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import ".."
 import "../../../qml/Notifications"

=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-10-08 09:07:28 +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 ".."
 import "../../../qml/Notifications"

=== modified file 'tests/qmltests/Panel/IndicatorTest.qml'
--- tests/qmltests/Panel/IndicatorTest.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/IndicatorTest.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators

=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2015-04-01 15:03:40 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import Ubuntu.Settings.Menus 0.1 as Menus

=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2014-09-09 15:10:52 +0000
+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import QMenuModel 0.1

=== modified file 'tests/qmltests/Panel/tst_ActiveCallHint.qml'
--- tests/qmltests/Panel/tst_ActiveCallHint.qml	2014-10-01 19:53:01 +0000
+++ tests/qmltests/Panel/tst_ActiveCallHint.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import Ubuntu.Telephony 0.1 as Telephony

=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
--- tests/qmltests/Panel/tst_IndicatorItemRow.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/tst_IndicatorItemRow.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Panel/tst_IndicatorPage.qml'
--- tests/qmltests/Panel/tst_IndicatorPage.qml	2014-10-31 17:07:08 +0000
+++ tests/qmltests/Panel/tst_IndicatorPage.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import Unity.Indicators 0.1 as Indicators

=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
--- tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
--- tests/qmltests/Panel/tst_MenuContent.qml	2015-01-21 15:47:20 +0000
+++ tests/qmltests/Panel/tst_MenuContent.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import "../../../qml/Panel"

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1

=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
--- tests/qmltests/Stages/ApplicationCheckBox.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/ApplicationCheckBox.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import Unity.Application 0.1

=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
--- tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import Unity.Application 0.1

=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import ".."

=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
--- tests/qmltests/Stages/tst_SessionContainer.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_SessionContainer.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
--- tests/qmltests/Stages/tst_Splash.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_Splash.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import ".."

=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1 as UT
 import ".."

=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
--- tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-10-08 09:07:28 +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 Unity.Test 0.1
 import ".."

=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_TabletStage.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Ubuntu.Components.ListItems 1.2 as ListItem

=== modified file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml'
--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Unity.Test 0.1 as UT

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import IntegratedLightDM 0.1 as LightDM

=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2015-10-08 09:07:28 +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 QtTest 1.0
 import AccountsService 0.1
 import MeeGo.QOfono 0.2

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import QtTest 1.0
 import Ubuntu.Components 1.2

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/tst_Shell.qml	2015-10-08 09:07:28 +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 AccountsService 0.1
 import GSettings 1.0

=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2015-10-08 09:07:28 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2015-10-08 09:07:28 +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.Components 1.2
 import QtTest 1.0
 import AccountsService 0.1

=== modified file 'tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml'
--- tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml	2015-10-08 09:07:28 +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 int dummy

=== modified file 'tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml'
--- tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml	2013-06-05 22:03:08 +0000
+++ tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml	2015-10-08 09:07:28 +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
 
 MockObjectForInstanceOfTest {
     property int dummy2

=== modified file 'tests/qmltests/utils/Unity/Test/tst_UnityTest.qml'
--- tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	2015-05-01 12:48:49 +0000
+++ tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	2015-10-08 09:07:28 +0000
@@ -15,7 +15,7 @@
  */
 
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Unity.Test 0.1
 

=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-10-08 09:07:28 +0000
+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-10-08 09:07:28 +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 QtQuick.Layouts 1.1
 import Ubuntu.Components 1.2
 import Unity.Test 0.1

=== modified file 'tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp'
--- tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp	2015-02-17 15:46:05 +0000
+++ tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp	2015-10-08 09:07:28 +0000
@@ -27,12 +27,10 @@
 void TouchEventSequenceWrapper::commit(bool processEvents)
 {
     m_eventSequence.commit(processEvents);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
     if (m_item->window()) {
         QQuickWindowPrivate *wp = QQuickWindowPrivate::get(m_item->window());
         wp->flushDelayedTouchEvent();
     }
-#endif
 }
 
 void TouchEventSequenceWrapper::move(int touchId, int x, int y)

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-10-08 09:07:28 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-10-08 09:07:28 +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 Ubuntu.Components 1.2
 import Unity.Test 0.1 as UT