Merge lp:~vthompson/ubuntu-weather-app/reboot-15.04 into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-06-18
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-06-21
Approved revision: 53
Merged at revision: 53
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-15.04
Merge into: lp:ubuntu-weather-app
Diff against target: 509 lines (+64/-65)
32 files modified
app/components/CurrentLocation.qml (+2/-2)
app/components/DayDelegate.qml (+2/-2)
app/components/ExpandableListItem.qml (+2/-2)
app/components/FastScroll.qml (+3/-3)
app/components/ForecastDetailsDelegate.qml (+2/-2)
app/components/HeaderRow.qml (+2/-2)
app/components/HomeGraphic.qml (+2/-2)
app/components/HomeHourly.qml (+2/-2)
app/components/HomeTempInfo.qml (+2/-2)
app/components/ListItemActions/CheckBox.qml (+3/-3)
app/components/ListItemActions/Remove.qml (+3/-3)
app/components/ListItemReorderComponent.qml (+2/-2)
app/components/ListItemWithActions.qml (+2/-2)
app/components/LoadingIndicator.qml (+2/-2)
app/components/MultiSelectHeadState.qml (+2/-2)
app/components/MultiSelectListView.qml (+2/-2)
app/components/PageWithBottomEdge.qml (+3/-3)
app/components/WeatherListItem.qml (+2/-2)
app/components/WeatherListView.qml (+2/-2)
app/data/Storage.qml (+1/-1)
app/ubuntu-weather-app.qml (+2/-3)
app/ui/AddLocationPage.qml (+2/-2)
app/ui/HomePage.qml (+2/-2)
app/ui/LocationPane.qml (+2/-2)
app/ui/LocationsPage.qml (+2/-2)
app/ui/SettingsPage.qml (+2/-2)
app/ui/settings/DataProviderPage.qml (+2/-2)
app/ui/settings/RefreshIntervalPage.qml (+2/-2)
app/ui/settings/UnitsPage.qml (+2/-2)
manifest.json.in (+1/-1)
po/com.ubuntu.weather.pot (+1/-1)
ubuntu-weather-app.apparmor (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-15.04
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) 2015-06-18 Approve on 2015-06-21
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-18
Review via email: mp+262286@code.launchpad.net

Commit message

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

To post a comment you must log in.
53. By Victor Thompson on 2015-06-18

Updates

Nekhelesh Ramananthan (nik90) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/CurrentLocation.qml'
2--- app/components/CurrentLocation.qml 2015-06-05 01:02:17 +0000
3+++ app/components/CurrentLocation.qml 2015-06-18 01:46:08 +0000
4@@ -18,8 +18,8 @@
5
6 import QtLocation 5.3
7 import QtPositioning 5.2
8-import QtQuick 2.3
9-import Ubuntu.Components 1.1
10+import QtQuick 2.4
11+import Ubuntu.Components 1.2
12 import "../data/WeatherApi.js" as WeatherApi
13
14
15
16=== modified file 'app/components/DayDelegate.qml'
17--- app/components/DayDelegate.qml 2015-04-26 15:52:22 +0000
18+++ app/components/DayDelegate.qml 2015-06-18 01:46:08 +0000
19@@ -16,8 +16,8 @@
20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21 */
22
23-import QtQuick 2.3
24-import Ubuntu.Components 1.1
25+import QtQuick 2.4
26+import Ubuntu.Components 1.2
27 import Ubuntu.Components.ListItems 0.1 as ListItem
28
29 ListItem.Standard {
30
31=== modified file 'app/components/ExpandableListItem.qml'
32--- app/components/ExpandableListItem.qml 2015-03-20 00:36:07 +0000
33+++ app/components/ExpandableListItem.qml 2015-06-18 01:46:08 +0000
34@@ -16,8 +16,8 @@
35 * along with this program. If not, see <http://www.gnu.org/licenses/>.
36 */
37
38-import QtQuick 2.3
39-import Ubuntu.Components 1.1
40+import QtQuick 2.4
41+import Ubuntu.Components 1.2
42 import Ubuntu.Components.ListItems 1.0 as ListItem
43
44 /*
45
46=== modified file 'app/components/FastScroll.qml'
47--- app/components/FastScroll.qml 2015-03-06 14:07:45 +0000
48+++ app/components/FastScroll.qml 2015-06-18 01:46:08 +0000
49@@ -1,7 +1,7 @@
50 /****************************************************************************
51 **
52 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
53-** Copyright (C) 2014 Canonical Ltda
54+** Copyright (C) 2014, 2015 Canonical Ltda
55 ** All rights reserved.
56 ** Contact: Nokia Corporation (qt-info@nokia.com)
57 **
58@@ -40,8 +40,8 @@
59 ****************************************************************************/
60
61 // FastScroll.qml
62-import QtQuick 2.3
63-import Ubuntu.Components 1.1
64+import QtQuick 2.4
65+import Ubuntu.Components 1.2
66 import "FastScroll.js" as Sections
67
68 Item {
69
70=== modified file 'app/components/ForecastDetailsDelegate.qml'
71--- app/components/ForecastDetailsDelegate.qml 2015-04-06 13:29:47 +0000
72+++ app/components/ForecastDetailsDelegate.qml 2015-06-18 01:46:08 +0000
73@@ -16,8 +16,8 @@
74 * along with this program. If not, see <http://www.gnu.org/licenses/>.
75 */
76
77-import QtQuick 2.3
78-import Ubuntu.Components 1.1
79+import QtQuick 2.4
80+import Ubuntu.Components 1.2
81 import Ubuntu.Components.ListItems 0.1 as ListItem
82
83 Row {
84
85=== modified file 'app/components/HeaderRow.qml'
86--- app/components/HeaderRow.qml 2015-04-09 22:22:55 +0000
87+++ app/components/HeaderRow.qml 2015-06-18 01:46:08 +0000
88@@ -16,9 +16,9 @@
89 * along with this program. If not, see <http://www.gnu.org/licenses/>.
90 */
91
92-import QtQuick 2.3
93+import QtQuick 2.4
94 import QtQuick.Layouts 1.1
95-import Ubuntu.Components 1.1
96+import Ubuntu.Components 1.2
97
98 RowLayout {
99 id: headerRow
100
101=== modified file 'app/components/HomeGraphic.qml'
102--- app/components/HomeGraphic.qml 2015-04-03 20:20:20 +0000
103+++ app/components/HomeGraphic.qml 2015-06-18 01:46:08 +0000
104@@ -16,8 +16,8 @@
105 * along with this program. If not, see <http://www.gnu.org/licenses/>.
106 */
107
108-import QtQuick 2.3
109-import Ubuntu.Components 1.1
110+import QtQuick 2.4
111+import Ubuntu.Components 1.2
112
113 Item {
114 height: units.gu(32)
115
116=== modified file 'app/components/HomeHourly.qml'
117--- app/components/HomeHourly.qml 2015-04-09 22:28:40 +0000
118+++ app/components/HomeHourly.qml 2015-06-18 01:46:08 +0000
119@@ -16,8 +16,8 @@
120 * along with this program. If not, see <http://www.gnu.org/licenses/>.
121 */
122
123-import QtQuick 2.3
124-import Ubuntu.Components 1.1
125+import QtQuick 2.4
126+import Ubuntu.Components 1.2
127
128 ListView {
129 id: homeHourly
130
131=== modified file 'app/components/HomeTempInfo.qml'
132--- app/components/HomeTempInfo.qml 2015-02-03 21:26:09 +0000
133+++ app/components/HomeTempInfo.qml 2015-06-18 01:46:08 +0000
134@@ -16,8 +16,8 @@
135 * along with this program. If not, see <http://www.gnu.org/licenses/>.
136 */
137
138-import QtQuick 2.3
139-import Ubuntu.Components 1.1
140+import QtQuick 2.4
141+import Ubuntu.Components 1.2
142
143
144 Column {
145
146=== modified file 'app/components/ListItemActions/CheckBox.qml'
147--- app/components/ListItemActions/CheckBox.qml 2015-03-03 18:37:59 +0000
148+++ app/components/ListItemActions/CheckBox.qml 2015-06-18 01:46:08 +0000
149@@ -1,5 +1,5 @@
150 /*
151- * Copyright (C) 2012-2014 Canonical, Ltd.
152+ * Copyright (C) 2012-2014, 2015 Canonical, Ltd.
153 *
154 * This program is free software; you can redistribute it and/or modify
155 * it under the terms of the GNU General Public License as published by
156@@ -14,8 +14,8 @@
157 * along with this program. If not, see <http://www.gnu.org/licenses/>.
158 */
159
160-import QtQuick 2.2
161-import Ubuntu.Components 1.1
162+import QtQuick 2.4
163+import Ubuntu.Components 1.2
164
165 CheckBox {
166 checked: root.selected
167
168=== modified file 'app/components/ListItemActions/Remove.qml'
169--- app/components/ListItemActions/Remove.qml 2015-03-03 18:37:59 +0000
170+++ app/components/ListItemActions/Remove.qml 2015-06-18 01:46:08 +0000
171@@ -1,5 +1,5 @@
172 /*
173- * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>
174+ * Copyright (C) 2014, 2015 Andrew Hayzen <ahayzen@gmail.com>
175 * Daniel Holm <d.holmen@gmail.com>
176 * Victor Thompson <victor.thompson@gmail.com>
177 *
178@@ -16,8 +16,8 @@
179 * along with this program. If not, see <http://www.gnu.org/licenses/>.
180 */
181
182-import QtQuick 2.3
183-import Ubuntu.Components 1.1
184+import QtQuick 2.4
185+import Ubuntu.Components 1.2
186
187 Action {
188 id: removeAction
189
190=== modified file 'app/components/ListItemReorderComponent.qml'
191--- app/components/ListItemReorderComponent.qml 2015-03-03 18:37:59 +0000
192+++ app/components/ListItemReorderComponent.qml 2015-06-18 01:46:08 +0000
193@@ -17,8 +17,8 @@
194 * along with this program. If not, see <http://www.gnu.org/licenses/>.
195 */
196
197-import QtQuick 2.3
198-import Ubuntu.Components 1.1
199+import QtQuick 2.4
200+import Ubuntu.Components 1.2
201
202
203 Item {
204
205=== modified file 'app/components/ListItemWithActions.qml'
206--- app/components/ListItemWithActions.qml 2015-03-03 18:37:59 +0000
207+++ app/components/ListItemWithActions.qml 2015-06-18 01:46:08 +0000
208@@ -14,8 +14,8 @@
209 * along with this program. If not, see <http://www.gnu.org/licenses/>.
210 */
211
212-import QtQuick 2.3
213-import Ubuntu.Components 1.1
214+import QtQuick 2.4
215+import Ubuntu.Components 1.2
216 import Ubuntu.Components.ListItems 1.0 as ListItem
217
218
219
220=== modified file 'app/components/LoadingIndicator.qml'
221--- app/components/LoadingIndicator.qml 2015-04-26 23:55:07 +0000
222+++ app/components/LoadingIndicator.qml 2015-06-18 01:46:08 +0000
223@@ -16,8 +16,8 @@
224 * along with this program. If not, see <http://www.gnu.org/licenses/>.
225 */
226
227-import QtQuick 2.3
228-import Ubuntu.Components 1.1
229+import QtQuick 2.4
230+import Ubuntu.Components 1.2
231
232 Rectangle {
233 id: indicator
234
235=== modified file 'app/components/MultiSelectHeadState.qml'
236--- app/components/MultiSelectHeadState.qml 2015-03-03 18:37:59 +0000
237+++ app/components/MultiSelectHeadState.qml 2015-06-18 01:46:08 +0000
238@@ -16,8 +16,8 @@
239 * along with this program. If not, see <http://www.gnu.org/licenses/>.
240 */
241
242-import QtQuick 2.3
243-import Ubuntu.Components 1.1
244+import QtQuick 2.4
245+import Ubuntu.Components 1.2
246
247 PageHeadState {
248 id: selectionState
249
250=== modified file 'app/components/MultiSelectListView.qml'
251--- app/components/MultiSelectListView.qml 2015-03-03 18:37:59 +0000
252+++ app/components/MultiSelectListView.qml 2015-06-18 01:46:08 +0000
253@@ -17,8 +17,8 @@
254 * along with this program. If not, see <http://www.gnu.org/licenses/>.
255 */
256
257-import QtQuick 2.3
258-import Ubuntu.Components 1.1
259+import QtQuick 2.4
260+import Ubuntu.Components 1.2
261
262
263 WeatherListView {
264
265=== modified file 'app/components/PageWithBottomEdge.qml'
266--- app/components/PageWithBottomEdge.qml 2015-02-09 01:26:54 +0000
267+++ app/components/PageWithBottomEdge.qml 2015-06-18 01:46:08 +0000
268@@ -1,5 +1,5 @@
269 /*
270- * Copyright (C) 2014 Canonical, Ltd.
271+ * Copyright (C) 2014, 2015 Canonical, Ltd.
272 *
273 * This program is free software; you can redistribute it and/or modify
274 * it under the terms of the GNU General Public License as published by
275@@ -62,8 +62,8 @@
276
277 */
278
279-import QtQuick 2.2
280-import Ubuntu.Components 1.1
281+import QtQuick 2.4
282+import Ubuntu.Components 1.2
283
284 Page {
285 id: page
286
287=== modified file 'app/components/WeatherListItem.qml'
288--- app/components/WeatherListItem.qml 2015-03-03 18:37:59 +0000
289+++ app/components/WeatherListItem.qml 2015-06-18 01:46:08 +0000
290@@ -17,8 +17,8 @@
291 * along with this program. If not, see <http://www.gnu.org/licenses/>.
292 */
293
294-import QtQuick 2.3
295-import Ubuntu.Components 1.1
296+import QtQuick 2.4
297+import Ubuntu.Components 1.2
298 import Ubuntu.Components.ListItems 0.1 as ListItem
299
300
301
302=== modified file 'app/components/WeatherListView.qml'
303--- app/components/WeatherListView.qml 2015-03-03 18:37:59 +0000
304+++ app/components/WeatherListView.qml 2015-06-18 01:46:08 +0000
305@@ -17,8 +17,8 @@
306 * along with this program. If not, see <http://www.gnu.org/licenses/>.
307 */
308
309-import QtQuick 2.3
310-import Ubuntu.Components 1.1
311+import QtQuick 2.4
312+import Ubuntu.Components 1.2
313
314
315 ListView {
316
317=== modified file 'app/data/Storage.qml'
318--- app/data/Storage.qml 2015-05-09 00:47:22 +0000
319+++ app/data/Storage.qml 2015-06-18 01:46:08 +0000
320@@ -16,7 +16,7 @@
321 * Authored by: Martin Borho <martin@borho.net>
322 */
323 import QtQuick.LocalStorage 2.0
324-import QtQuick 2.3
325+import QtQuick 2.4
326
327 Item {
328 property var db: null
329
330=== modified file 'app/ubuntu-weather-app.qml'
331--- app/ubuntu-weather-app.qml 2015-06-10 01:47:37 +0000
332+++ app/ubuntu-weather-app.qml 2015-06-18 01:46:08 +0000
333@@ -16,9 +16,9 @@
334 * along with this program. If not, see <http://www.gnu.org/licenses/>.
335 */
336
337-import QtQuick 2.3
338+import QtQuick 2.4
339 import Qt.labs.settings 1.0
340-import Ubuntu.Components 1.1
341+import Ubuntu.Components 1.2
342 import "components"
343 import "data" as Data
344 import "data/WeatherApi.js" as WeatherApi
345@@ -39,7 +39,6 @@
346
347 backgroundColor: "#F5F5F5"
348
349- useDeprecatedToolbar: false
350 anchorToKeyboard: true
351
352 signal listItemSwiping(int i)
353
354=== modified file 'app/ui/AddLocationPage.qml'
355--- app/ui/AddLocationPage.qml 2015-05-29 02:38:23 +0000
356+++ app/ui/AddLocationPage.qml 2015-06-18 01:46:08 +0000
357@@ -16,8 +16,8 @@
358 * along with this program. If not, see <http://www.gnu.org/licenses/>.
359 */
360
361-import QtQuick 2.3
362-import Ubuntu.Components 1.1
363+import QtQuick 2.4
364+import Ubuntu.Components 1.2
365 import Ubuntu.Components.ListItems 1.0 as ListItem
366 import Ubuntu.Components.Popups 1.0
367 import "../components"
368
369=== modified file 'app/ui/HomePage.qml'
370--- app/ui/HomePage.qml 2015-06-13 23:12:30 +0000
371+++ app/ui/HomePage.qml 2015-06-18 01:46:08 +0000
372@@ -16,8 +16,8 @@
373 * along with this program. If not, see <http://www.gnu.org/licenses/>.
374 */
375
376-import QtQuick 2.3
377-import Ubuntu.Components 1.1
378+import QtQuick 2.4
379+import Ubuntu.Components 1.2
380 import "../components"
381
382
383
384=== modified file 'app/ui/LocationPane.qml'
385--- app/ui/LocationPane.qml 2015-06-06 17:35:38 +0000
386+++ app/ui/LocationPane.qml 2015-06-18 01:46:08 +0000
387@@ -16,8 +16,8 @@
388 * along with this program. If not, see <http://www.gnu.org/licenses/>.
389 */
390
391-import QtQuick 2.3
392-import Ubuntu.Components 1.1
393+import QtQuick 2.4
394+import Ubuntu.Components 1.2
395 import Ubuntu.Components.ListItems 0.1 as ListItem
396 import "../components"
397
398
399=== modified file 'app/ui/LocationsPage.qml'
400--- app/ui/LocationsPage.qml 2015-06-14 21:17:22 +0000
401+++ app/ui/LocationsPage.qml 2015-06-18 01:46:08 +0000
402@@ -16,8 +16,8 @@
403 * along with this program. If not, see <http://www.gnu.org/licenses/>.
404 */
405
406-import QtQuick 2.3
407-import Ubuntu.Components 1.1
408+import QtQuick 2.4
409+import Ubuntu.Components 1.2
410 import Ubuntu.Components.ListItems 0.1 as ListItem
411 import "../components"
412 import "../components/ListItemActions"
413
414=== modified file 'app/ui/SettingsPage.qml'
415--- app/ui/SettingsPage.qml 2015-03-06 13:38:30 +0000
416+++ app/ui/SettingsPage.qml 2015-06-18 01:46:08 +0000
417@@ -16,8 +16,8 @@
418 * along with this program. If not, see <http://www.gnu.org/licenses/>.
419 */
420
421-import QtQuick 2.3
422-import Ubuntu.Components 1.1
423+import QtQuick 2.4
424+import Ubuntu.Components 1.2
425 import Ubuntu.Components.ListItems 0.1 as ListItem
426
427 Page {
428
429=== modified file 'app/ui/settings/DataProviderPage.qml'
430--- app/ui/settings/DataProviderPage.qml 2015-05-09 01:16:10 +0000
431+++ app/ui/settings/DataProviderPage.qml 2015-06-18 01:46:08 +0000
432@@ -16,8 +16,8 @@
433 * along with this program. If not, see <http://www.gnu.org/licenses/>.
434 */
435
436-import QtQuick 2.3
437-import Ubuntu.Components 1.1
438+import QtQuick 2.4
439+import Ubuntu.Components 1.2
440 import Ubuntu.Components.ListItems 0.1 as ListItem
441 import "../../components"
442
443
444=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
445--- app/ui/settings/RefreshIntervalPage.qml 2015-03-20 00:36:07 +0000
446+++ app/ui/settings/RefreshIntervalPage.qml 2015-06-18 01:46:08 +0000
447@@ -16,8 +16,8 @@
448 * along with this program. If not, see <http://www.gnu.org/licenses/>.
449 */
450
451-import QtQuick 2.3
452-import Ubuntu.Components 1.1
453+import QtQuick 2.4
454+import Ubuntu.Components 1.2
455 import Ubuntu.Components.ListItems 0.1 as ListItem
456 import "../../components"
457
458
459=== modified file 'app/ui/settings/UnitsPage.qml'
460--- app/ui/settings/UnitsPage.qml 2015-04-27 00:57:35 +0000
461+++ app/ui/settings/UnitsPage.qml 2015-06-18 01:46:08 +0000
462@@ -16,8 +16,8 @@
463 * along with this program. If not, see <http://www.gnu.org/licenses/>.
464 */
465
466-import QtQuick 2.3
467-import Ubuntu.Components 1.1
468+import QtQuick 2.4
469+import Ubuntu.Components 1.2
470 import Ubuntu.Components.ListItems 0.1 as ListItem
471 import "../../components"
472
473
474=== modified file 'manifest.json.in'
475--- manifest.json.in 2015-05-17 23:11:54 +0000
476+++ manifest.json.in 2015-06-18 01:46:08 +0000
477@@ -1,7 +1,7 @@
478 {
479 "architecture": "all",
480 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
481- "framework": "ubuntu-sdk-14.10-qml",
482+ "framework": "ubuntu-sdk-15.04-qml",
483 "hooks": {
484 "weather": {
485 "apparmor": "ubuntu-weather-app.apparmor",
486
487=== modified file 'po/com.ubuntu.weather.pot'
488--- po/com.ubuntu.weather.pot 2015-06-05 23:11:51 +0000
489+++ po/com.ubuntu.weather.pot 2015-06-18 01:46:08 +0000
490@@ -8,7 +8,7 @@
491 msgstr ""
492 "Project-Id-Version: ubuntu-weather-app\n"
493 "Report-Msgid-Bugs-To: \n"
494-"POT-Creation-Date: 2015-06-05 18:04-0500\n"
495+"POT-Creation-Date: 2015-06-09 19:05-0500\n"
496 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
497 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
498 "Language-Team: LANGUAGE <LL@li.org>\n"
499
500=== modified file 'ubuntu-weather-app.apparmor'
501--- ubuntu-weather-app.apparmor 2015-05-19 03:18:19 +0000
502+++ ubuntu-weather-app.apparmor 2015-06-18 01:46:08 +0000
503@@ -4,5 +4,5 @@
504 "networking",
505 "sensors"
506 ],
507- "policy_version": 1.2
508+ "policy_version": 1.3
509 }

Subscribers

People subscribed via source and target branches

to all changes: