Merge lp:~fboucault/task-app/migrate_toolkit_13 into lp:task-app

Proposed by Florian Boucault
Status: Needs review
Proposed branch: lp:~fboucault/task-app/migrate_toolkit_13
Merge into: lp:task-app
Diff against target: 177 lines (+33/-36)
12 files modified
app/components/DoneView.qml (+3/-3)
app/components/FilterView.qml (+3/-3)
app/components/IconLabel.qml (+2/-2)
app/components/PageWithBottomEdge.qml (+2/-2)
app/components/Tag.qml (+2/-2)
app/components/TagList.qml (+2/-2)
app/components/TagRow.qml (+2/-2)
app/components/TagView.qml (+4/-4)
app/components/TaskView.qml (+5/-5)
app/components/TodoView.qml (+3/-3)
app/main.qml (+3/-6)
app/tests/unit/tst_hellocomponent.qml (+2/-2)
To merge this branch: bzr merge lp:~fboucault/task-app/migrate_toolkit_13
Reviewer Review Type Date Requested Status
Victor Tuson Palau Pending
Review via email: mp+282899@code.launchpad.net

Commit message

Migrated to version 1.3 of the Ubuntu UI Toolkit

To post a comment you must log in.
46. By Florian Boucault

Added bug tag

Unmerged revisions

46. By Florian Boucault

Added bug tag

45. By Florian Boucault

Migrated to version 1.3 of the Ubuntu UI Toolkit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/components/DoneView.qml'
--- app/components/DoneView.qml 2014-10-08 17:56:22 +0000
+++ app/components/DoneView.qml 2016-01-18 10:21:37 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import "../js/tasks.js" as Tasks4import "../js/tasks.js" as Tasks
55
6Page {6Page {
77
=== modified file 'app/components/FilterView.qml'
--- app/components/FilterView.qml 2014-10-08 17:56:22 +0000
+++ app/components/FilterView.qml 2016-01-18 10:21:37 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import "../js/tasks.js" as Tasks4import "../js/tasks.js" as Tasks
55
6Page {6Page {
77
=== modified file 'app/components/IconLabel.qml'
--- app/components/IconLabel.qml 2014-11-26 11:14:56 +0000
+++ app/components/IconLabel.qml 2016-01-18 10:21:37 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
4Item {4Item {
5 property alias text:mainLabel.text5 property alias text:mainLabel.text
66
=== modified file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml 2014-10-07 11:42:05 +0000
+++ app/components/PageWithBottomEdge.qml 2016-01-18 10:21:37 +0000
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.166import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
7070
=== modified file 'app/components/Tag.qml'
--- app/components/Tag.qml 2014-10-01 22:36:10 +0000
+++ app/components/Tag.qml 2016-01-18 10:21:37 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
44
5UbuntuShape {5UbuntuShape {
66
=== modified file 'app/components/TagList.qml'
--- app/components/TagList.qml 2014-10-01 22:36:10 +0000
+++ app/components/TagList.qml 2016-01-18 10:21:37 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import "../js/taglist.js" as Tags3import "../js/taglist.js" as Tags
44
55
66
=== modified file 'app/components/TagRow.qml'
--- app/components/TagRow.qml 2014-10-01 22:36:10 +0000
+++ app/components/TagRow.qml 2016-01-18 10:21:37 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
4Row {4Row {
5 spacing:units.gu(1)5 spacing:units.gu(1)
66
=== modified file 'app/components/TagView.qml'
--- app/components/TagView.qml 2014-10-08 17:56:22 +0000
+++ app/components/TagView.qml 2016-01-18 10:21:37 +0000
@@ -1,9 +1,9 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import "../js/tasks.js" as Tasks3import "../js/tasks.js" as Tasks
4import "../js/taglist.js" as Tags4import "../js/taglist.js" as Tags
5import Ubuntu.Components.Themes.Ambiance 1.05import Ubuntu.Components.Themes.Ambiance 1.3
6import Ubuntu.Components.ListItems 1.0 as ListItem6import Ubuntu.Components.ListItems 1.3 as ListItem
77
88
9Column {9Column {
1010
=== modified file 'app/components/TaskView.qml'
--- app/components/TaskView.qml 2014-11-26 12:27:18 +0000
+++ app/components/TaskView.qml 2016-01-18 10:21:37 +0000
@@ -1,8 +1,8 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import Ubuntu.Components.Pickers 1.04import Ubuntu.Components.Pickers 1.3
5import Ubuntu.Components.Themes.Ambiance 1.05import Ubuntu.Components.Themes.Ambiance 1.3
66
7import "../js/tasks.js" as Tasks7import "../js/tasks.js" as Tasks
88
99
=== modified file 'app/components/TodoView.qml'
--- app/components/TodoView.qml 2014-11-26 11:14:56 +0000
+++ app/components/TodoView.qml 2016-01-18 10:21:37 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItem3import Ubuntu.Components.ListItems 1.3 as ListItem
4import "../js/tasks.js" as Tasks4import "../js/tasks.js" as Tasks
5import "../js/filter.js" as Filters5import "../js/filter.js" as Filters
66
77
=== modified file 'app/main.qml'
--- app/main.qml 2014-10-08 17:56:22 +0000
+++ app/main.qml 2016-01-18 10:21:37 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
3import Ubuntu.Components.ListItems 1.0 as ListItems3import Ubuntu.Components.ListItems 1.3 as ListItems
44
5import "components"5import "components"
66
@@ -21,9 +21,6 @@
21 */21 */
22 //automaticOrientation: true22 //automaticOrientation: true
2323
24 // Removes the old toolbar and enables new features of the new header.
25 useDeprecatedToolbar: false
26
27 width: units.gu(100)24 width: units.gu(100)
28 height: units.gu(75)25 height: units.gu(75)
29 PageStack {26 PageStack {
3027
=== modified file 'app/tests/unit/tst_hellocomponent.qml'
--- app/tests/unit/tst_hellocomponent.qml 2014-09-25 19:20:07 +0000
+++ app/tests/unit/tst_hellocomponent.qml 2016-01-18 10:21:37 +0000
@@ -1,6 +1,6 @@
1import QtQuick 2.01import QtQuick 2.4
2import QtTest 1.02import QtTest 1.0
3import Ubuntu.Components 1.13import Ubuntu.Components 1.3
4import "../../components"4import "../../components"
55
6// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html6// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html

Subscribers

People subscribed via source and target branches