Merge lp:~aacid/ubuntu-settings-components/standarizeImports into lp:~registry/ubuntu-settings-components/trunk

[Albert Astals Cid]

Standarize QtQuick and Ubuntu.Components.Listitems imports

Also add a missing copyright header

* 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

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/120/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/120/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

:D

review: Needs Fixing

[lp:~aacid/ubuntu-settings-components/standarizeImports]

105. By Albert Astals Cid on 2015-12-14

2015

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/121/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-vivid/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-vivid-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/121/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
unrelated, but tests work locally

review: Approve

=== modified file 'examples/MessageComponents.qml'
--- examples/MessageComponents.qml	2015-09-15 09:42:23 +0000
+++ examples/MessageComponents.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'examples/OtherComponents.qml'
--- examples/OtherComponents.qml	2015-06-18 09:52:25 +0000
+++ examples/OtherComponents.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'examples/SettingsComponents.qml'
--- examples/SettingsComponents.qml	2015-06-23 12:15:12 +0000
+++ examples/SettingsComponents.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'examples/TransferComponents.qml'
--- examples/TransferComponents.qml	2015-06-18 09:52:25 +0000
+++ examples/TransferComponents.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
 * Authored by Andrea Cimitan <[e-mail]>
 */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'plugins/Ubuntu/Settings/Components/ActionTextField.qml'
--- plugins/Ubuntu/Settings/Components/ActionTextField.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Components/ActionTextField.qml	2015-12-14 10:48:11 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 

=== modified file 'plugins/Ubuntu/Settings/Components/Calendar.qml'
--- plugins/Ubuntu/Settings/Components/Calendar.qml	2015-06-17 18:28:12 +0000
+++ plugins/Ubuntu/Settings/Components/Calendar.qml	2015-12-14 10:48:11 +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.3
 import "dateExt.js" as DateExt
 

=== modified file 'plugins/Ubuntu/Settings/Components/MessageHeader.qml'
--- plugins/Ubuntu/Settings/Components/MessageHeader.qml	2015-10-21 11:48:14 +0000
+++ plugins/Ubuntu/Settings/Components/MessageHeader.qml	2015-12-14 10:48:11 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import QtQuick.Layouts 1.1
 

=== modified file 'plugins/Ubuntu/Settings/Components/QuickReply.qml'
--- plugins/Ubuntu/Settings/Components/QuickReply.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Components/QuickReply.qml	2015-12-14 10:48:11 +0000
@@ -18,9 +18,9 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Item {
     id: quickReply

=== modified file 'plugins/Ubuntu/Settings/Components/StatusIcon.qml'
--- plugins/Ubuntu/Settings/Components/StatusIcon.qml	2014-07-01 12:10:32 +0000
+++ plugins/Ubuntu/Settings/Components/StatusIcon.qml	2015-12-14 10:48:11 +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: root

=== modified file 'plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml'
--- plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml	2015-09-15 09:35:02 +0000
+++ plugins/Ubuntu/Settings/Components/UbuntuShapeForItem.qml	2015-12-14 10:48:11 +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.3
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more

=== modified file 'plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml'
--- plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml	2015-06-17 18:28:12 +0000
+++ plugins/Ubuntu/Settings/Menus/AccessPointMenu.qml	2015-12-14 10:48:11 +0000
@@ -17,9 +17,9 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/ButtonMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ButtonMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/ButtonMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 StandardMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/CalendarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2015-09-15 09:42:32 +0000
+++ plugins/Ubuntu/Settings/Menus/CalendarMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Settings.Components 0.1
 
 ListItem.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/CheckableMenu.qml'
--- plugins/Ubuntu/Settings/Menus/CheckableMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/CheckableMenu.qml	2015-12-14 10:48:11 +0000
@@ -17,9 +17,9 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3 as Components
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/EventMenu.qml'
--- plugins/Ubuntu/Settings/Menus/EventMenu.qml	2015-06-17 18:28:12 +0000
+++ plugins/Ubuntu/Settings/Menus/EventMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import Ubuntu.Components.ListItems 1.3 as ListItems
 
 ListItems.Empty {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -18,9 +18,9 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 StandardMenu {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
--- plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import QtQuick.Layouts 1.1
 
 ListItem.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml'
--- plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2015-06-17 18:28:12 +0000
+++ plugins/Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import QtQuick.Layouts 1.1
 
 ListItem.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressBarMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 StandardMenu {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml'
--- plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/ProgressValueMenu.qml	2015-12-14 10:48:11 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 StandardMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/SectionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SectionMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/SectionMenu.qml	2015-12-14 10:48:11 +0000
@@ -17,9 +17,9 @@
  *      Renato Araujo Oliveira Filho <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Header {
     id: menuItem

=== modified file 'plugins/Ubuntu/Settings/Menus/SeparatorMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SeparatorMenu.qml	2014-09-11 13:30:09 +0000
+++ plugins/Ubuntu/Settings/Menus/SeparatorMenu.qml	2015-12-14 10:48:11 +0000
@@ -1,5 +1,22 @@
-import QtQuick 2.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     __height: units.gu(1)

=== modified file 'plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/SimpleMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -18,9 +18,9 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.1
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Settings.Components 0.1 as USC
 import QtQuick.Layouts 1.1
 

=== modified file 'plugins/Ubuntu/Settings/Menus/SliderMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SliderMenu.qml	2015-06-17 18:28:12 +0000
+++ plugins/Ubuntu/Settings/Menus/SliderMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 ListItem.Empty {
     id: menu

=== modified file 'plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2015-12-14 10:48:11 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1 as USC
 import QtQuick.Layouts 1.1

=== modified file 'plugins/Ubuntu/Settings/Menus/StandardMenu.qml'
--- plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Menus/StandardMenu.qml	2015-12-14 10:48:11 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItems
+import Ubuntu.Components.ListItems 1.3 as ListItems
 import QtQuick.Layouts 1.1
 
 ListItems.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/SwitchMenu.qml'
--- plugins/Ubuntu/Settings/Menus/SwitchMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/SwitchMenu.qml	2015-12-14 10:48:11 +0000
@@ -17,7 +17,7 @@
  *      Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 StandardMenu {

=== modified file 'plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Menus/TextMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -18,7 +18,7 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Settings.Components 0.1 as USC
 

=== modified file 'plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml	2015-06-18 09:52:25 +0000
+++ plugins/Ubuntu/Settings/Menus/TimeZoneMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 StandardMenu {
     id: timeZoneMenu

=== modified file 'plugins/Ubuntu/Settings/Menus/TransferMenu.qml'
--- plugins/Ubuntu/Settings/Menus/TransferMenu.qml	2015-09-15 09:35:02 +0000
+++ plugins/Ubuntu/Settings/Menus/TransferMenu.qml	2015-12-14 10:48:11 +0000
@@ -14,10 +14,10 @@
  * 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.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Settings.Components 0.1
 
 ListItem.Empty {

=== modified file 'plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml'
--- plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2015-09-15 09:42:23 +0000
+++ plugins/Ubuntu/Settings/Menus/UserSessionMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,9 +16,9 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 StandardMenu {
     id: userSessionMenu

=== modified file 'tests/qmltests/Components/tst_Calendar.qml'
--- tests/qmltests/Components/tst_Calendar.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Components/tst_Calendar.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Components 0.1

=== modified file 'tests/qmltests/Components/tst_ServerPropertySynchroniser.qml'
--- tests/qmltests/Components/tst_ServerPropertySynchroniser.qml	2015-06-18 09:52:25 +0000
+++ tests/qmltests/Components/tst_ServerPropertySynchroniser.qml	2015-12-14 10:48:11 +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.Test 0.1
 import Ubuntu.Settings.Components 0.1 as USC

=== modified file 'tests/qmltests/Components/tst_StatusIcon.qml'
--- tests/qmltests/Components/tst_StatusIcon.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Components/tst_StatusIcon.qml	2015-12-14 10:48:11 +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.Test 0.1
 import Ubuntu.Settings.Components 0.1

=== modified file 'tests/qmltests/Menus/tst_AccessPointMenu.qml'
--- tests/qmltests/Menus/tst_AccessPointMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_AccessPointMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_ButtonMenu.qml'
--- tests/qmltests/Menus/tst_ButtonMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_ButtonMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_CalendarMenu.qml'
--- tests/qmltests/Menus/tst_CalendarMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_CalendarMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_CheckableMenu.qml'
--- tests/qmltests/Menus/tst_CheckableMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_CheckableMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_EventMenu.qml'
--- tests/qmltests/Menus/tst_EventMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_EventMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_GroupedMessageMenu.qml'
--- tests/qmltests/Menus/tst_GroupedMessageMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_GroupedMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_MediaPlayerMenu.qml'
--- tests/qmltests/Menus/tst_MediaPlayerMenu.qml	2014-09-24 09:54:49 +0000
+++ tests/qmltests/Menus/tst_MediaPlayerMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_PlaybackItemMenu.qml'
--- tests/qmltests/Menus/tst_PlaybackItemMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_PlaybackItemMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_ProgressBarMenu.qml'
--- tests/qmltests/Menus/tst_ProgressBarMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_ProgressBarMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_ProgressValueMenu.qml'
--- tests/qmltests/Menus/tst_ProgressValueMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_ProgressValueMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_SectionMenu.qml'
--- tests/qmltests/Menus/tst_SectionMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_SectionMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_SimpleMessageMenu.qml'
--- tests/qmltests/Menus/tst_SimpleMessageMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_SimpleMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_SliderMenu.qml'
--- tests/qmltests/Menus/tst_SliderMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_SliderMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_SnapDecisionMenu.qml'
--- tests/qmltests/Menus/tst_SnapDecisionMenu.qml	2015-04-22 10:39:31 +0000
+++ tests/qmltests/Menus/tst_SnapDecisionMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_SwitchMenu.qml'
--- tests/qmltests/Menus/tst_SwitchMenu.qml	2014-08-14 11:19:43 +0000
+++ tests/qmltests/Menus/tst_SwitchMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_TextMessageMenu.qml'
--- tests/qmltests/Menus/tst_TextMessageMenu.qml	2015-04-22 10:39:31 +0000
+++ tests/qmltests/Menus/tst_TextMessageMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Nick Dedekind <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_TimeZoneMenu.qml'
--- tests/qmltests/Menus/tst_TimeZoneMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_TimeZoneMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_TransferMenu.qml'
--- tests/qmltests/Menus/tst_TransferMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_TransferMenu.qml	2015-12-14 10:48:11 +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.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/qmltests/Menus/tst_UserSessionMenu.qml'
--- tests/qmltests/Menus/tst_UserSessionMenu.qml	2014-08-07 15:14:07 +0000
+++ tests/qmltests/Menus/tst_UserSessionMenu.qml	2015-12-14 10:48:11 +0000
@@ -16,7 +16,7 @@
  * Authored by Andrea Cimitan <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtTest 1.0
 import Ubuntu.Test 0.1
 import Ubuntu.Settings.Menus 0.1

=== modified file 'tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml'
--- tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml	2015-06-18 09:52:25 +0000
+++ tests/utils/modules/Ubuntu/Test/UbuntuTestCase.qml	2015-12-14 10:48:11 +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.3
 import Ubuntu.Test 0.1 as UT