Merge lp:~fboucault/ciborium/migrate_toolkit_13 into lp:ciborium

[Florian Boucault]

Migrated to version 1.3 of the Ubuntu UI Toolkit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/ciborium-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ciborium-vivid-i386-ci/37

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

review: Approve (continuous-integration)

Unmerged revisions

149. By Florian Boucault on 2016-01-18

Migrated to version 1.3 of the Ubuntu UI Toolkit

=== modified file 'share/ciborium/qml/components/DriveDelegate.qml'
--- share/ciborium/qml/components/DriveDelegate.qml	2015-03-13 17:35:54 +0000
+++ share/ciborium/qml/components/DriveDelegate.qml	2016-01-18 10:02:14 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 UbuntuShape {
     property var onFormatClicked

=== modified file 'share/ciborium/qml/components/FormatConfirmation.qml'
--- share/ciborium/qml/components/FormatConfirmation.qml	2015-03-13 17:58:27 +0000
+++ share/ciborium/qml/components/FormatConfirmation.qml	2016-01-18 10:02:14 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 Dialog {
     property bool isError: driveCtrl.formatError

=== modified file 'share/ciborium/qml/components/FormatDialog.qml'
--- share/ciborium/qml/components/FormatDialog.qml	2015-03-13 17:49:02 +0000
+++ share/ciborium/qml/components/FormatDialog.qml	2016-01-18 10:02:14 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 Dialog {
     property int driveIndex

=== modified file 'share/ciborium/qml/components/SafeRemoval.qml'
--- share/ciborium/qml/components/SafeRemoval.qml	2015-03-13 17:12:17 +0000
+++ share/ciborium/qml/components/SafeRemoval.qml	2016-01-18 10:02:14 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 
 Dialog {

=== modified file 'share/ciborium/qml/components/SafeRemovalConfirmation.qml'
--- share/ciborium/qml/components/SafeRemovalConfirmation.qml	2015-03-13 17:12:17 +0000
+++ share/ciborium/qml/components/SafeRemovalConfirmation.qml	2016-01-18 10:02:14 +0000
@@ -1,6 +1,6 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 
 Dialog {
     property bool isError: driveCtrl.unmountError

=== modified file 'share/ciborium/qml/main.qml'
--- share/ciborium/qml/main.qml	2015-03-13 17:58:27 +0000
+++ share/ciborium/qml/main.qml	2016-01-18 10:02:14 +0000
@@ -1,7 +1,7 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Components.Popups 1.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
 
 import "components"