Ubuntu Shorts App

Merge lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. update-imports-to-qtquick-2.3
  2. Merge into trunk
Proposed by Kill Animals
Status: Merged
Approved by: Joey Chan
Approved revision: 316
Merged at revision: 317
Proposed branch: lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 277 lines (+26/-26)
26 files modified
ArticleViewItem.qml (+1/-1)
GoogleFeedApi.qml (+1/-1)
GridModePage.qml (+1/-1)
ListModePage.qml (+1/-1)
OptionsKeeper.qml (+1/-1)
OrganicGrid.qml (+1/-1)
ReadingOptions.qml (+1/-1)
RssFeedPage.qml (+1/-1)
SavedTab.qml (+1/-1)
ShortsTab.qml (+1/-1)
TopicTab.qml (+1/-1)
XmlNetwork.qml (+1/-1)
article_items/ArticleFullImg.qml (+1/-1)
article_items/ArticleOneImgA.qml (+1/-1)
article_items/ArticleTextA.qml (+1/-1)
article_items/ArticleTextB.qml (+1/-1)
feeds/AppendFeedPage.qml (+1/-1)
feeds/ChooseTopicPage.qml (+1/-1)
feeds/CreateTopicPage.qml (+1/-1)
feeds/EditFeed.qml (+1/-1)
feeds/FeedComponent.qml (+1/-1)
feeds/SwipeDelete.qml (+1/-1)
feeds/TopicComponent.qml (+1/-1)
feeds/TopicManagement.qml (+1/-1)
po/com.ubuntu.shorts.pot (+1/-1)
shorts-app.qml (+1/-1)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-rssreader-app/update-imports-to-qtquick-2.3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+235367@code.launchpad.net

Commit message

Updated library imports to qtquick-2.3

Description of the change

Updated library imports to qtquick-2.3

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:316
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~akiva/ubuntu-rssreader-app/update-imports-to-qtquick-2.3/+merge/235367/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/267/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/412
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/46

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
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-09-18 02:28:48 +0000
3+++ ArticleViewItem.qml 2014-09-20 10:52:20 +0000
4@@ -6,7 +6,7 @@
5
6 */
7
8-import QtQuick 2.0
9+import QtQuick 2.3
10 import QtQuick.XmlListModel 2.0
11 import Ubuntu.Components 1.1
12 import Ubuntu.Components.ListItems 1.0 as ListItem
13
14=== modified file 'GoogleFeedApi.qml'
15--- GoogleFeedApi.qml 2013-11-05 19:29:36 +0000
16+++ GoogleFeedApi.qml 2014-09-20 10:52:20 +0000
17@@ -1,4 +1,4 @@
18-import QtQuick 2.0
19+import QtQuick 2.3
20
21 QtObject {
22 id: rootObject
23
24=== modified file 'GridModePage.qml'
25--- GridModePage.qml 2014-09-02 06:34:00 +0000
26+++ GridModePage.qml 2014-09-20 10:52:20 +0000
27@@ -1,4 +1,4 @@
28-import QtQuick 2.0
29+import QtQuick 2.3
30 import Ubuntu.Components 1.1
31 import Ubuntu.Components.ListItems 1.0 as ListItem
32 import Ubuntu.Components.Popups 1.0
33
34=== modified file 'ListModePage.qml'
35--- ListModePage.qml 2014-09-18 02:28:48 +0000
36+++ ListModePage.qml 2014-09-20 10:52:20 +0000
37@@ -1,4 +1,4 @@
38-import QtQuick 2.0
39+import QtQuick 2.3
40 import QtQuick.XmlListModel 2.0
41
42 import Ubuntu.Components 1.1
43
44=== modified file 'OptionsKeeper.qml'
45--- OptionsKeeper.qml 2014-04-30 04:26:13 +0000
46+++ OptionsKeeper.qml 2014-09-20 10:52:20 +0000
47@@ -1,4 +1,4 @@
48-import QtQuick 2.0
49+import QtQuick 2.3
50 import U1db 1.0 as U1db
51 // import "databasemodule_v2.js" as DB
52
53
54=== modified file 'OrganicGrid.qml'
55--- OrganicGrid.qml 2014-09-02 06:34:00 +0000
56+++ OrganicGrid.qml 2014-09-20 10:52:20 +0000
57@@ -1,4 +1,4 @@
58-import QtQuick 2.0
59+import QtQuick 2.3
60 import QtGraphicalEffects 1.0
61 import Ubuntu.Components 1.1
62 import "databasemodule_v2.js" as DB
63
64=== modified file 'ReadingOptions.qml'
65--- ReadingOptions.qml 2014-09-02 06:34:00 +0000
66+++ ReadingOptions.qml 2014-09-20 10:52:20 +0000
67@@ -6,7 +6,7 @@
68
69 */
70
71-import QtQuick 2.0
72+import QtQuick 2.3
73 import QtQuick.XmlListModel 2.0
74 import Ubuntu.Components 1.1
75 import Ubuntu.Components.ListItems 1.0 as ListItem
76
77=== modified file 'RssFeedPage.qml'
78--- RssFeedPage.qml 2014-09-18 02:28:48 +0000
79+++ RssFeedPage.qml 2014-09-20 10:52:20 +0000
80@@ -6,7 +6,7 @@
81
82 */
83
84-import QtQuick 2.0
85+import QtQuick 2.3
86 import QtQuick.XmlListModel 2.0
87 import Ubuntu.Components 1.1
88 import Ubuntu.Components.ListItems 1.0 as ListItem
89
90=== modified file 'SavedTab.qml'
91--- SavedTab.qml 2014-09-18 02:28:48 +0000
92+++ SavedTab.qml 2014-09-20 10:52:20 +0000
93@@ -1,4 +1,4 @@
94-import QtQuick 2.0
95+import QtQuick 2.3
96 import Ubuntu.Components 1.1
97 import Ubuntu.Components.ListItems 1.0 as ListItem
98 import Ubuntu.Components.Popups 1.0
99
100=== modified file 'ShortsTab.qml'
101--- ShortsTab.qml 2014-09-18 02:28:48 +0000
102+++ ShortsTab.qml 2014-09-20 10:52:20 +0000
103@@ -1,4 +1,4 @@
104-import QtQuick 2.0
105+import QtQuick 2.3
106 import Ubuntu.Components 1.1
107 import Ubuntu.Components.ListItems 1.0 as ListItem
108 import Ubuntu.Components.Popups 1.0
109
110=== modified file 'TopicTab.qml'
111--- TopicTab.qml 2014-09-18 02:28:48 +0000
112+++ TopicTab.qml 2014-09-20 10:52:20 +0000
113@@ -1,4 +1,4 @@
114-import QtQuick 2.0
115+import QtQuick 2.3
116 import Ubuntu.Components 1.1
117 import Ubuntu.Components.ListItems 1.0 as ListItem
118 import Ubuntu.Components.Popups 1.0
119
120=== modified file 'XmlNetwork.qml'
121--- XmlNetwork.qml 2014-09-02 06:34:00 +0000
122+++ XmlNetwork.qml 2014-09-20 10:52:20 +0000
123@@ -1,4 +1,4 @@
124-import QtQuick 2.0
125+import QtQuick 2.3
126 import QtQuick.XmlListModel 2.0
127
128 import Ubuntu.Components 1.1
129
130=== modified file 'article_items/ArticleFullImg.qml'
131--- article_items/ArticleFullImg.qml 2014-09-02 06:34:00 +0000
132+++ article_items/ArticleFullImg.qml 2014-09-20 10:52:20 +0000
133@@ -1,4 +1,4 @@
134-import QtQuick 2.0
135+import QtQuick 2.3
136 import Ubuntu.Components 1.1
137 import Ubuntu.Components.ListItems 1.0 as ListItem
138 import "../dateutils.js" as DateUtils
139
140=== modified file 'article_items/ArticleOneImgA.qml'
141--- article_items/ArticleOneImgA.qml 2014-09-02 06:34:00 +0000
142+++ article_items/ArticleOneImgA.qml 2014-09-20 10:52:20 +0000
143@@ -1,4 +1,4 @@
144-import QtQuick 2.0
145+import QtQuick 2.3
146 import Ubuntu.Components 1.1
147 import Ubuntu.Components.ListItems 1.0 as ListItem
148 import "../dateutils.js" as DateUtils
149
150=== modified file 'article_items/ArticleTextA.qml'
151--- article_items/ArticleTextA.qml 2014-09-02 06:34:00 +0000
152+++ article_items/ArticleTextA.qml 2014-09-20 10:52:20 +0000
153@@ -1,4 +1,4 @@
154-import QtQuick 2.0
155+import QtQuick 2.3
156 import Ubuntu.Components 1.1
157 import Ubuntu.Components.ListItems 1.0 as ListItem
158 import "../dateutils.js" as DateUtils
159
160=== modified file 'article_items/ArticleTextB.qml'
161--- article_items/ArticleTextB.qml 2014-09-02 06:34:00 +0000
162+++ article_items/ArticleTextB.qml 2014-09-20 10:52:20 +0000
163@@ -1,4 +1,4 @@
164-import QtQuick 2.0
165+import QtQuick 2.3
166 import Ubuntu.Components 1.1
167 import Ubuntu.Components.ListItems 1.0 as ListItem
168 import "../dateutils.js" as DateUtils
169
170=== modified file 'feeds/AppendFeedPage.qml'
171--- feeds/AppendFeedPage.qml 2014-09-18 02:28:48 +0000
172+++ feeds/AppendFeedPage.qml 2014-09-20 10:52:20 +0000
173@@ -14,7 +14,7 @@
174 * along with this program. If not, see <http://www.gnu.org/licenses/>.
175 */
176
177-import QtQuick 2.0
178+import QtQuick 2.3
179 import QtQuick.XmlListModel 2.0
180 import Ubuntu.Components 1.1
181 import Ubuntu.Components.ListItems 1.0 as ListItem
182
183=== modified file 'feeds/ChooseTopicPage.qml'
184--- feeds/ChooseTopicPage.qml 2014-09-18 02:28:48 +0000
185+++ feeds/ChooseTopicPage.qml 2014-09-20 10:52:20 +0000
186@@ -1,4 +1,4 @@
187-import QtQuick 2.0
188+import QtQuick 2.3
189 import QtQuick.XmlListModel 2.0
190 import Ubuntu.Components 1.1
191 import Ubuntu.Components.ListItems 1.0 as ListItem
192
193=== modified file 'feeds/CreateTopicPage.qml'
194--- feeds/CreateTopicPage.qml 2014-09-18 02:28:48 +0000
195+++ feeds/CreateTopicPage.qml 2014-09-20 10:52:20 +0000
196@@ -1,4 +1,4 @@
197-import QtQuick 2.0
198+import QtQuick 2.3
199 import QtQuick.XmlListModel 2.0
200 import Ubuntu.Components 1.1
201 import Ubuntu.Components.ListItems 1.0 as ListItem
202
203=== modified file 'feeds/EditFeed.qml'
204--- feeds/EditFeed.qml 2014-09-02 06:34:00 +0000
205+++ feeds/EditFeed.qml 2014-09-20 10:52:20 +0000
206@@ -1,4 +1,4 @@
207-import QtQuick 2.0
208+import QtQuick 2.3
209 import Ubuntu.Components 1.1
210 import Ubuntu.Components.ListItems 1.0 as ListItem
211 import Ubuntu.Components.Popups 1.0
212
213=== modified file 'feeds/FeedComponent.qml'
214--- feeds/FeedComponent.qml 2014-09-02 06:34:00 +0000
215+++ feeds/FeedComponent.qml 2014-09-20 10:52:20 +0000
216@@ -1,4 +1,4 @@
217-import QtQuick 2.0
218+import QtQuick 2.3
219 import Ubuntu.Components 1.1
220 import Ubuntu.Components.ListItems 1.0 as ListItem
221
222
223=== modified file 'feeds/SwipeDelete.qml'
224--- feeds/SwipeDelete.qml 2014-09-02 06:34:00 +0000
225+++ feeds/SwipeDelete.qml 2014-09-20 10:52:20 +0000
226@@ -16,7 +16,7 @@
227 * along with this program. If not, see <http://www.gnu.org/licenses/>.
228 */
229
230-import QtQuick 2.0
231+import QtQuick 2.3
232 import Ubuntu.Components 1.1
233
234 /* SwipeDelete object */
235
236=== modified file 'feeds/TopicComponent.qml'
237--- feeds/TopicComponent.qml 2014-09-18 02:28:48 +0000
238+++ feeds/TopicComponent.qml 2014-09-20 10:52:20 +0000
239@@ -1,4 +1,4 @@
240-import QtQuick 2.0
241+import QtQuick 2.3
242 import Ubuntu.Components 1.1
243 import Ubuntu.Components.ListItems 1.0 as ListItem
244
245
246=== modified file 'feeds/TopicManagement.qml'
247--- feeds/TopicManagement.qml 2014-09-18 02:28:48 +0000
248+++ feeds/TopicManagement.qml 2014-09-20 10:52:20 +0000
249@@ -1,4 +1,4 @@
250-import QtQuick 2.0
251+import QtQuick 2.3
252 import Ubuntu.Components 1.1
253 import Ubuntu.Components.ListItems 1.0 as ListItem
254 import Ubuntu.Components.Popups 1.0
255
256=== modified file 'po/com.ubuntu.shorts.pot'
257--- po/com.ubuntu.shorts.pot 2014-09-18 21:04:34 +0000
258+++ po/com.ubuntu.shorts.pot 2014-09-20 10:52:20 +0000
259@@ -8,7 +8,7 @@
260 msgstr ""
261 "Project-Id-Version: \n"
262 "Report-Msgid-Bugs-To: \n"
263-"POT-Creation-Date: 2014-09-18 23:03+0200\n"
264+"POT-Creation-Date: 2014-09-20 02:37-0700\n"
265 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
266 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
267 "Language-Team: LANGUAGE <LL@li.org>\n"
268
269=== modified file 'shorts-app.qml'
270--- shorts-app.qml 2014-09-18 02:28:48 +0000
271+++ shorts-app.qml 2014-09-20 10:52:20 +0000
272@@ -1,4 +1,4 @@
273-import QtQuick 2.0
274+import QtQuick 2.3
275 import QtQuick.XmlListModel 2.0
276 import Ubuntu.Components 1.1
277 import Ubuntu.Components.ListItems 1.0 as ListItem

Subscribers

People subscribed via source and target branches