task-app

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

  1. migrate_toolkit_13
  2. Merge into trunk
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.
lp:~fboucault/task-app/migrate_toolkit_13 updated
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
1=== modified file 'app/components/DoneView.qml'
2--- app/components/DoneView.qml 2014-10-08 17:56:22 +0000
3+++ app/components/DoneView.qml 2016-01-18 10:21:37 +0000
4@@ -1,6 +1,6 @@
5-import QtQuick 2.0
6-import Ubuntu.Components 1.1
7-import Ubuntu.Components.ListItems 1.0 as ListItem
8+import QtQuick 2.4
9+import Ubuntu.Components 1.3
10+import Ubuntu.Components.ListItems 1.3 as ListItem
11 import "../js/tasks.js" as Tasks
12
13 Page {
14
15=== modified file 'app/components/FilterView.qml'
16--- app/components/FilterView.qml 2014-10-08 17:56:22 +0000
17+++ app/components/FilterView.qml 2016-01-18 10:21:37 +0000
18@@ -1,6 +1,6 @@
19-import QtQuick 2.0
20-import Ubuntu.Components 1.1
21-import Ubuntu.Components.ListItems 1.0 as ListItem
22+import QtQuick 2.4
23+import Ubuntu.Components 1.3
24+import Ubuntu.Components.ListItems 1.3 as ListItem
25 import "../js/tasks.js" as Tasks
26
27 Page {
28
29=== modified file 'app/components/IconLabel.qml'
30--- app/components/IconLabel.qml 2014-11-26 11:14:56 +0000
31+++ app/components/IconLabel.qml 2016-01-18 10:21:37 +0000
32@@ -1,5 +1,5 @@
33-import QtQuick 2.0
34-import Ubuntu.Components 1.1
35+import QtQuick 2.4
36+import Ubuntu.Components 1.3
37
38 Item {
39 property alias text:mainLabel.text
40
41=== modified file 'app/components/PageWithBottomEdge.qml'
42--- app/components/PageWithBottomEdge.qml 2014-10-07 11:42:05 +0000
43+++ app/components/PageWithBottomEdge.qml 2016-01-18 10:21:37 +0000
44@@ -62,8 +62,8 @@
45
46 */
47
48-import QtQuick 2.2
49-import Ubuntu.Components 1.1
50+import QtQuick 2.4
51+import Ubuntu.Components 1.3
52
53 Page {
54 id: page
55
56=== modified file 'app/components/Tag.qml'
57--- app/components/Tag.qml 2014-10-01 22:36:10 +0000
58+++ app/components/Tag.qml 2016-01-18 10:21:37 +0000
59@@ -1,5 +1,5 @@
60-import QtQuick 2.0
61-import Ubuntu.Components 1.1
62+import QtQuick 2.4
63+import Ubuntu.Components 1.3
64
65
66 UbuntuShape {
67
68=== modified file 'app/components/TagList.qml'
69--- app/components/TagList.qml 2014-10-01 22:36:10 +0000
70+++ app/components/TagList.qml 2016-01-18 10:21:37 +0000
71@@ -1,5 +1,5 @@
72-import QtQuick 2.0
73-import Ubuntu.Components 1.1
74+import QtQuick 2.4
75+import Ubuntu.Components 1.3
76 import "../js/taglist.js" as Tags
77
78
79
80=== modified file 'app/components/TagRow.qml'
81--- app/components/TagRow.qml 2014-10-01 22:36:10 +0000
82+++ app/components/TagRow.qml 2016-01-18 10:21:37 +0000
83@@ -1,5 +1,5 @@
84-import QtQuick 2.0
85-import Ubuntu.Components 1.1
86+import QtQuick 2.4
87+import Ubuntu.Components 1.3
88
89 Row {
90 spacing:units.gu(1)
91
92=== modified file 'app/components/TagView.qml'
93--- app/components/TagView.qml 2014-10-08 17:56:22 +0000
94+++ app/components/TagView.qml 2016-01-18 10:21:37 +0000
95@@ -1,9 +1,9 @@
96-import QtQuick 2.0
97-import Ubuntu.Components 1.1
98+import QtQuick 2.4
99+import Ubuntu.Components 1.3
100 import "../js/tasks.js" as Tasks
101 import "../js/taglist.js" as Tags
102-import Ubuntu.Components.Themes.Ambiance 1.0
103-import Ubuntu.Components.ListItems 1.0 as ListItem
104+import Ubuntu.Components.Themes.Ambiance 1.3
105+import Ubuntu.Components.ListItems 1.3 as ListItem
106
107
108 Column {
109
110=== modified file 'app/components/TaskView.qml'
111--- app/components/TaskView.qml 2014-11-26 12:27:18 +0000
112+++ app/components/TaskView.qml 2016-01-18 10:21:37 +0000
113@@ -1,8 +1,8 @@
114-import QtQuick 2.0
115-import Ubuntu.Components 1.1
116-import Ubuntu.Components.ListItems 1.0 as ListItem
117-import Ubuntu.Components.Pickers 1.0
118-import Ubuntu.Components.Themes.Ambiance 1.0
119+import QtQuick 2.4
120+import Ubuntu.Components 1.3
121+import Ubuntu.Components.ListItems 1.3 as ListItem
122+import Ubuntu.Components.Pickers 1.3
123+import Ubuntu.Components.Themes.Ambiance 1.3
124
125 import "../js/tasks.js" as Tasks
126
127
128=== modified file 'app/components/TodoView.qml'
129--- app/components/TodoView.qml 2014-11-26 11:14:56 +0000
130+++ app/components/TodoView.qml 2016-01-18 10:21:37 +0000
131@@ -1,6 +1,6 @@
132-import QtQuick 2.0
133-import Ubuntu.Components 1.1
134-import Ubuntu.Components.ListItems 1.0 as ListItem
135+import QtQuick 2.4
136+import Ubuntu.Components 1.3
137+import Ubuntu.Components.ListItems 1.3 as ListItem
138 import "../js/tasks.js" as Tasks
139 import "../js/filter.js" as Filters
140
141
142=== modified file 'app/main.qml'
143--- app/main.qml 2014-10-08 17:56:22 +0000
144+++ app/main.qml 2016-01-18 10:21:37 +0000
145@@ -1,6 +1,6 @@
146-import QtQuick 2.0
147-import Ubuntu.Components 1.1
148-import Ubuntu.Components.ListItems 1.0 as ListItems
149+import QtQuick 2.4
150+import Ubuntu.Components 1.3
151+import Ubuntu.Components.ListItems 1.3 as ListItems
152
153 import "components"
154
155@@ -21,9 +21,6 @@
156 */
157 //automaticOrientation: true
158
159- // Removes the old toolbar and enables new features of the new header.
160- useDeprecatedToolbar: false
161-
162 width: units.gu(100)
163 height: units.gu(75)
164 PageStack {
165
166=== modified file 'app/tests/unit/tst_hellocomponent.qml'
167--- app/tests/unit/tst_hellocomponent.qml 2014-09-25 19:20:07 +0000
168+++ app/tests/unit/tst_hellocomponent.qml 2016-01-18 10:21:37 +0000
169@@ -1,6 +1,6 @@
170-import QtQuick 2.0
171+import QtQuick 2.4
172 import QtTest 1.0
173-import Ubuntu.Components 1.1
174+import Ubuntu.Components 1.3
175 import "../../components"
176
177 // See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html

Subscribers

People subscribed via source and target branches