Ubuntu Shorts App

Merge lp:~kill-animals/ubuntu-rssreader-app/upgrade-Ubuntu-Components-1.1 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. upgrade-Ubuntu-Components-1.1
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Joey Chan
Approved revision: 302
Merged at revision: 304
Proposed branch: lp:~kill-animals/ubuntu-rssreader-app/upgrade-Ubuntu-Components-1.1
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 345 lines (+61/-61)
23 files modified
ArticleViewItem.qml (+3/-3)
GridModePage.qml (+3/-3)
ListModePage.qml (+3/-3)
OrganicGrid.qml (+1/-1)
ReadingOptions.qml (+3/-3)
RssFeedPage.qml (+3/-3)
SavedTab.qml (+3/-3)
ShortsTab.qml (+3/-3)
TopicTab.qml (+3/-3)
XmlNetwork.qml (+3/-3)
article_items/ArticleFullImg.qml (+2/-2)
article_items/ArticleOneImgA.qml (+2/-2)
article_items/ArticleTextA.qml (+2/-2)
article_items/ArticleTextB.qml (+2/-2)
feeds/AppendFeedPage.qml (+3/-3)
feeds/ChooseTopicPage.qml (+3/-3)
feeds/CreateTopicPage.qml (+3/-3)
feeds/EditFeed.qml (+4/-4)
feeds/FeedComponent.qml (+2/-2)
feeds/SwipeDelete.qml (+1/-1)
feeds/TopicComponent.qml (+2/-2)
feeds/TopicManagement.qml (+4/-4)
shorts-app.qml (+3/-3)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-rssreader-app/upgrade-Ubuntu-Components-1.1
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+232981@code.launchpad.net

Commit message

Upgraded to the following libs:
import Ubuntu.Components 1.1
import Ubuntu.Components.xxxx 1.0
import Ubuntu.Layouts 1.0

Description of the change

Upgraded to the following libs:
import Ubuntu.Components 1.1
import Ubuntu.Components.xxxx 1.0
import Ubuntu.Layouts 1.0

To post a comment you must log in.
Revision history for this message
Joey Chan (qqworini) wrote :

no autopilot test ?

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:302
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/261/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1878
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1878/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/40

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/261/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ArticleViewItem.qml'
2--- ArticleViewItem.qml 2014-07-01 03:34:07 +0000
3+++ ArticleViewItem.qml 2014-09-02 06:35:28 +0000
4@@ -8,9 +8,9 @@
5
6 import QtQuick 2.0
7 import QtQuick.XmlListModel 2.0
8-import Ubuntu.Components 0.1
9-import Ubuntu.Components.ListItems 0.1 as ListItem
10-import Ubuntu.Components.Popups 0.1
11+import Ubuntu.Components 1.1
12+import Ubuntu.Components.ListItems 1.0 as ListItem
13+import Ubuntu.Components.Popups 1.0
14 import "./dateutils.js" as DateUtils
15 import "databasemodule_v2.js" as DB
16
17
18=== modified file 'GridModePage.qml'
19--- GridModePage.qml 2014-03-04 18:53:44 +0000
20+++ GridModePage.qml 2014-09-02 06:35:28 +0000
21@@ -1,7 +1,7 @@
22 import QtQuick 2.0
23-import Ubuntu.Components 0.1
24-import Ubuntu.Components.ListItems 0.1 as ListItem
25-import Ubuntu.Components.Popups 0.1
26+import Ubuntu.Components 1.1
27+import Ubuntu.Components.ListItems 1.0 as ListItem
28+import Ubuntu.Components.Popups 1.0
29
30 import "databasemodule_v2.js" as DB
31
32
33=== modified file 'ListModePage.qml'
34--- ListModePage.qml 2014-05-14 05:28:12 +0000
35+++ ListModePage.qml 2014-09-02 06:35:28 +0000
36@@ -1,9 +1,9 @@
37 import QtQuick 2.0
38 import QtQuick.XmlListModel 2.0
39
40-import Ubuntu.Components 0.1
41-import Ubuntu.Components.ListItems 0.1 as ListItems
42-import Ubuntu.Components.Popups 0.1
43+import Ubuntu.Components 1.1
44+import Ubuntu.Components.ListItems 1.0 as ListItems
45+import Ubuntu.Components.Popups 1.0
46
47 import "databasemodule_v2.js" as DB
48 import "dateutils.js" as DateUtils
49
50=== modified file 'OrganicGrid.qml'
51--- OrganicGrid.qml 2014-08-07 13:46:10 +0000
52+++ OrganicGrid.qml 2014-09-02 06:35:28 +0000
53@@ -1,6 +1,6 @@
54 import QtQuick 2.0
55 import QtGraphicalEffects 1.0
56-import Ubuntu.Components 0.1
57+import Ubuntu.Components 1.1
58 import "databasemodule_v2.js" as DB
59 import "./imgSeparator.js" as ImageSeparator
60
61
62=== modified file 'ReadingOptions.qml'
63--- ReadingOptions.qml 2014-03-08 15:27:10 +0000
64+++ ReadingOptions.qml 2014-09-02 06:35:28 +0000
65@@ -8,9 +8,9 @@
66
67 import QtQuick 2.0
68 import QtQuick.XmlListModel 2.0
69-import Ubuntu.Components 0.1
70-import Ubuntu.Components.ListItems 0.1 as ListItem
71-import Ubuntu.Components.Popups 0.1
72+import Ubuntu.Components 1.1
73+import Ubuntu.Components.ListItems 1.0 as ListItem
74+import Ubuntu.Components.Popups 1.0
75 import "./dateutils.js" as DateUtils
76 import "databasemodule_v2.js" as DB
77
78
79=== modified file 'RssFeedPage.qml'
80--- RssFeedPage.qml 2014-03-08 15:27:10 +0000
81+++ RssFeedPage.qml 2014-09-02 06:35:28 +0000
82@@ -8,9 +8,9 @@
83
84 import QtQuick 2.0
85 import QtQuick.XmlListModel 2.0
86-import Ubuntu.Components 0.1
87-import Ubuntu.Components.ListItems 0.1 as ListItem
88-import Ubuntu.Components.Popups 0.1
89+import Ubuntu.Components 1.1
90+import Ubuntu.Components.ListItems 1.0 as ListItem
91+import Ubuntu.Components.Popups 1.0
92 import "./dateutils.js" as DateUtils
93 import "databasemodule_v2.js" as DB
94
95
96=== modified file 'SavedTab.qml'
97--- SavedTab.qml 2014-04-30 17:33:12 +0000
98+++ SavedTab.qml 2014-09-02 06:35:28 +0000
99@@ -1,7 +1,7 @@
100 import QtQuick 2.0
101-import Ubuntu.Components 0.1
102-import Ubuntu.Components.ListItems 0.1 as ListItem
103-import Ubuntu.Components.Popups 0.1
104+import Ubuntu.Components 1.1
105+import Ubuntu.Components.ListItems 1.0 as ListItem
106+import Ubuntu.Components.Popups 1.0
107
108 import "databasemodule_v2.js" as DB
109 import "listview"
110
111=== modified file 'ShortsTab.qml'
112--- ShortsTab.qml 2014-07-04 05:07:22 +0000
113+++ ShortsTab.qml 2014-09-02 06:35:28 +0000
114@@ -1,7 +1,7 @@
115 import QtQuick 2.0
116-import Ubuntu.Components 0.1
117-import Ubuntu.Components.ListItems 0.1 as ListItem
118-import Ubuntu.Components.Popups 0.1
119+import Ubuntu.Components 1.1
120+import Ubuntu.Components.ListItems 1.0 as ListItem
121+import Ubuntu.Components.Popups 1.0
122
123 import "databasemodule_v2.js" as DB
124 import "listview"
125
126=== modified file 'TopicTab.qml'
127--- TopicTab.qml 2014-04-30 04:26:13 +0000
128+++ TopicTab.qml 2014-09-02 06:35:28 +0000
129@@ -1,7 +1,7 @@
130 import QtQuick 2.0
131-import Ubuntu.Components 0.1
132-import Ubuntu.Components.ListItems 0.1 as ListItem
133-import Ubuntu.Components.Popups 0.1
134+import Ubuntu.Components 1.1
135+import Ubuntu.Components.ListItems 1.0 as ListItem
136+import Ubuntu.Components.Popups 1.0
137
138 import "databasemodule_v2.js" as DB
139 import "listview"
140
141=== modified file 'XmlNetwork.qml'
142--- XmlNetwork.qml 2014-08-07 14:10:55 +0000
143+++ XmlNetwork.qml 2014-09-02 06:35:28 +0000
144@@ -1,9 +1,9 @@
145 import QtQuick 2.0
146 import QtQuick.XmlListModel 2.0
147
148-import Ubuntu.Components 0.1
149-import Ubuntu.Components.ListItems 0.1 as ListItems
150-import Ubuntu.Components.Popups 0.1
151+import Ubuntu.Components 1.1
152+import Ubuntu.Components.ListItems 1.0 as ListItems
153+import Ubuntu.Components.Popups 1.0
154
155 import "databasemodule_v2.js" as DB
156 import "./imgSeparator.js" as ImageUtils
157
158=== modified file 'article_items/ArticleFullImg.qml'
159--- article_items/ArticleFullImg.qml 2014-06-26 05:05:56 +0000
160+++ article_items/ArticleFullImg.qml 2014-09-02 06:35:28 +0000
161@@ -1,6 +1,6 @@
162 import QtQuick 2.0
163-import Ubuntu.Components 0.1
164-import Ubuntu.Components.ListItems 0.1 as ListItem
165+import Ubuntu.Components 1.1
166+import Ubuntu.Components.ListItems 1.0 as ListItem
167 import "../dateutils.js" as DateUtils
168 import "../databasemodule_v2.js" as DB
169
170
171=== modified file 'article_items/ArticleOneImgA.qml'
172--- article_items/ArticleOneImgA.qml 2014-06-26 05:05:56 +0000
173+++ article_items/ArticleOneImgA.qml 2014-09-02 06:35:28 +0000
174@@ -1,6 +1,6 @@
175 import QtQuick 2.0
176-import Ubuntu.Components 0.1
177-import Ubuntu.Components.ListItems 0.1 as ListItem
178+import Ubuntu.Components 1.1
179+import Ubuntu.Components.ListItems 1.0 as ListItem
180 import "../dateutils.js" as DateUtils
181 import "../databasemodule_v2.js" as DB
182
183
184=== modified file 'article_items/ArticleTextA.qml'
185--- article_items/ArticleTextA.qml 2014-06-26 05:05:56 +0000
186+++ article_items/ArticleTextA.qml 2014-09-02 06:35:28 +0000
187@@ -1,6 +1,6 @@
188 import QtQuick 2.0
189-import Ubuntu.Components 0.1
190-import Ubuntu.Components.ListItems 0.1 as ListItem
191+import Ubuntu.Components 1.1
192+import Ubuntu.Components.ListItems 1.0 as ListItem
193 import "../dateutils.js" as DateUtils
194 import "../databasemodule_v2.js" as DB
195
196
197=== modified file 'article_items/ArticleTextB.qml'
198--- article_items/ArticleTextB.qml 2014-06-26 05:05:56 +0000
199+++ article_items/ArticleTextB.qml 2014-09-02 06:35:28 +0000
200@@ -1,6 +1,6 @@
201 import QtQuick 2.0
202-import Ubuntu.Components 0.1
203-import Ubuntu.Components.ListItems 0.1 as ListItem
204+import Ubuntu.Components 1.1
205+import Ubuntu.Components.ListItems 1.0 as ListItem
206 import "../dateutils.js" as DateUtils
207 import "../databasemodule_v2.js" as DB
208
209
210=== modified file 'feeds/AppendFeedPage.qml'
211--- feeds/AppendFeedPage.qml 2014-08-02 17:23:54 +0000
212+++ feeds/AppendFeedPage.qml 2014-09-02 06:35:28 +0000
213@@ -16,9 +16,9 @@
214
215 import QtQuick 2.0
216 import QtQuick.XmlListModel 2.0
217-import Ubuntu.Components 0.1
218-import Ubuntu.Components.ListItems 0.1 as ListItem
219-import Ubuntu.Components.Popups 0.1
220+import Ubuntu.Components 1.1
221+import Ubuntu.Components.ListItems 1.0 as ListItem
222+import Ubuntu.Components.Popups 1.0
223
224 import "../databasemodule_v2.js" as DB
225 import "../."
226
227=== modified file 'feeds/ChooseTopicPage.qml'
228--- feeds/ChooseTopicPage.qml 2014-08-02 17:23:54 +0000
229+++ feeds/ChooseTopicPage.qml 2014-09-02 06:35:28 +0000
230@@ -1,8 +1,8 @@
231 import QtQuick 2.0
232 import QtQuick.XmlListModel 2.0
233-import Ubuntu.Components 0.1
234-import Ubuntu.Components.ListItems 0.1 as ListItem
235-import Ubuntu.Components.Popups 0.1
236+import Ubuntu.Components 1.1
237+import Ubuntu.Components.ListItems 1.0 as ListItem
238+import Ubuntu.Components.Popups 1.0
239
240 import "../databasemodule_v2.js" as DB
241
242
243=== modified file 'feeds/CreateTopicPage.qml'
244--- feeds/CreateTopicPage.qml 2014-08-02 17:23:54 +0000
245+++ feeds/CreateTopicPage.qml 2014-09-02 06:35:28 +0000
246@@ -1,8 +1,8 @@
247 import QtQuick 2.0
248 import QtQuick.XmlListModel 2.0
249-import Ubuntu.Components 0.1
250-import Ubuntu.Components.ListItems 0.1 as ListItem
251-import Ubuntu.Components.Popups 0.1
252+import Ubuntu.Components 1.1
253+import Ubuntu.Components.ListItems 1.0 as ListItem
254+import Ubuntu.Components.Popups 1.0
255
256 import "../databasemodule_v2.js" as DB
257
258
259=== modified file 'feeds/EditFeed.qml'
260--- feeds/EditFeed.qml 2013-11-25 14:20:53 +0000
261+++ feeds/EditFeed.qml 2014-09-02 06:35:28 +0000
262@@ -1,8 +1,8 @@
263 import QtQuick 2.0
264-import Ubuntu.Components 0.1
265-import Ubuntu.Components.ListItems 0.1 as ListItem
266-import Ubuntu.Components.Popups 0.1
267-import Ubuntu.Layouts 0.1
268+import Ubuntu.Components 1.1
269+import Ubuntu.Components.ListItems 1.0 as ListItem
270+import Ubuntu.Components.Popups 1.0
271+import Ubuntu.Layouts 1.0
272
273 import "../databasemodule_v2.js" as DB
274
275
276=== modified file 'feeds/FeedComponent.qml'
277--- feeds/FeedComponent.qml 2013-08-03 10:06:36 +0000
278+++ feeds/FeedComponent.qml 2014-09-02 06:35:28 +0000
279@@ -1,6 +1,6 @@
280 import QtQuick 2.0
281-import Ubuntu.Components 0.1
282-import Ubuntu.Components.ListItems 0.1 as ListItem
283+import Ubuntu.Components 1.1
284+import Ubuntu.Components.ListItems 1.0 as ListItem
285
286 //ListItem.Standard {
287 // id: feedComponent
288
289=== modified file 'feeds/SwipeDelete.qml'
290--- feeds/SwipeDelete.qml 2013-10-03 17:07:16 +0000
291+++ feeds/SwipeDelete.qml 2014-09-02 06:35:28 +0000
292@@ -17,7 +17,7 @@
293 */
294
295 import QtQuick 2.0
296-import Ubuntu.Components 0.1
297+import Ubuntu.Components 1.1
298
299 /* SwipeDelete object */
300 Item {
301
302=== modified file 'feeds/TopicComponent.qml'
303--- feeds/TopicComponent.qml 2014-05-20 09:31:08 +0000
304+++ feeds/TopicComponent.qml 2014-09-02 06:35:28 +0000
305@@ -1,6 +1,6 @@
306 import QtQuick 2.0
307-import Ubuntu.Components 0.1
308-import Ubuntu.Components.ListItems 0.1 as ListItem
309+import Ubuntu.Components 1.1
310+import Ubuntu.Components.ListItems 1.0 as ListItem
311
312 import "../databasemodule_v2.js" as DB
313
314
315=== modified file 'feeds/TopicManagement.qml'
316--- feeds/TopicManagement.qml 2014-08-02 17:23:54 +0000
317+++ feeds/TopicManagement.qml 2014-09-02 06:35:28 +0000
318@@ -1,8 +1,8 @@
319 import QtQuick 2.0
320-import Ubuntu.Components 0.1
321-import Ubuntu.Components.ListItems 0.1 as ListItem
322-import Ubuntu.Components.Popups 0.1
323-import Ubuntu.Layouts 0.1
324+import Ubuntu.Components 1.1
325+import Ubuntu.Components.ListItems 1.0 as ListItem
326+import Ubuntu.Components.Popups 1.0
327+import Ubuntu.Layouts 1.0
328
329 import "../databasemodule_v2.js" as DB
330
331
332=== modified file 'shorts-app.qml'
333--- shorts-app.qml 2014-08-08 06:04:56 +0000
334+++ shorts-app.qml 2014-09-02 06:35:28 +0000
335@@ -1,8 +1,8 @@
336 import QtQuick 2.0
337 import QtQuick.XmlListModel 2.0
338-import Ubuntu.Components 0.1
339-import Ubuntu.Components.ListItems 0.1 as ListItem
340-import Ubuntu.Components.Popups 0.1
341+import Ubuntu.Components 1.1
342+import Ubuntu.Components.ListItems 1.0 as ListItem
343+import Ubuntu.Components.Popups 1.0
344 import "./feeds"
345 import "./listview"
346

Subscribers

People subscribed via source and target branches