Merge lp:~vthompson/ubuntu-weather-app/reboot-15.04 into lp:ubuntu-weather-app
- reboot-15.04
- Merge into reboot
Proposed by
Victor Thompson
Status: | Merged |
---|---|
Approved by: | Nekhelesh Ramananthan |
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nekhelesh Ramananthan (community) | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
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 useDeprecatedTo
Description of the change
To post a comment you must log in.
- 53. By Victor Thompson
-
Updates
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
review:
Approve
(continuous-integration)
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 | 18 | 18 | ||
6 | 19 | import QtLocation 5.3 | 19 | import QtLocation 5.3 |
7 | 20 | import QtPositioning 5.2 | 20 | import QtPositioning 5.2 |
10 | 21 | import QtQuick 2.3 | 21 | import QtQuick 2.4 |
11 | 22 | import Ubuntu.Components 1.1 | 22 | import Ubuntu.Components 1.2 |
12 | 23 | import "../data/WeatherApi.js" as WeatherApi | 23 | import "../data/WeatherApi.js" as WeatherApi |
13 | 24 | 24 | ||
14 | 25 | 25 | ||
15 | 26 | 26 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
21 | 17 | */ | 17 | */ |
22 | 18 | 18 | ||
25 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
26 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
27 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
28 | 22 | 22 | ||
29 | 23 | ListItem.Standard { | 23 | ListItem.Standard { |
30 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
36 | 17 | */ | 17 | */ |
37 | 18 | 18 | ||
40 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
41 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
42 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem |
43 | 22 | 22 | ||
44 | 23 | /* | 23 | /* |
45 | 24 | 24 | ||
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 | 1 | /**************************************************************************** | 1 | /**************************************************************************** |
51 | 2 | ** | 2 | ** |
52 | 3 | ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). | 3 | ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). |
54 | 4 | ** Copyright (C) 2014 Canonical Ltda | 4 | ** Copyright (C) 2014, 2015 Canonical Ltda |
55 | 5 | ** All rights reserved. | 5 | ** All rights reserved. |
56 | 6 | ** Contact: Nokia Corporation (qt-info@nokia.com) | 6 | ** Contact: Nokia Corporation (qt-info@nokia.com) |
57 | 7 | ** | 7 | ** |
58 | @@ -40,8 +40,8 @@ | |||
59 | 40 | ****************************************************************************/ | 40 | ****************************************************************************/ |
60 | 41 | 41 | ||
61 | 42 | // FastScroll.qml | 42 | // FastScroll.qml |
64 | 43 | import QtQuick 2.3 | 43 | import QtQuick 2.4 |
65 | 44 | import Ubuntu.Components 1.1 | 44 | import Ubuntu.Components 1.2 |
66 | 45 | import "FastScroll.js" as Sections | 45 | import "FastScroll.js" as Sections |
67 | 46 | 46 | ||
68 | 47 | Item { | 47 | Item { |
69 | 48 | 48 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
75 | 17 | */ | 17 | */ |
76 | 18 | 18 | ||
79 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
80 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
81 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
82 | 22 | 22 | ||
83 | 23 | Row { | 23 | Row { |
84 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
90 | 17 | */ | 17 | */ |
91 | 18 | 18 | ||
93 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
94 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
96 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
97 | 22 | 22 | ||
98 | 23 | RowLayout { | 23 | RowLayout { |
99 | 24 | id: headerRow | 24 | id: headerRow |
100 | 25 | 25 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
106 | 17 | */ | 17 | */ |
107 | 18 | 18 | ||
110 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
111 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
112 | 21 | 21 | ||
113 | 22 | Item { | 22 | Item { |
114 | 23 | height: units.gu(32) | 23 | height: units.gu(32) |
115 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
121 | 17 | */ | 17 | */ |
122 | 18 | 18 | ||
125 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
126 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
127 | 21 | 21 | ||
128 | 22 | ListView { | 22 | ListView { |
129 | 23 | id: homeHourly | 23 | id: homeHourly |
130 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
136 | 17 | */ | 17 | */ |
137 | 18 | 18 | ||
140 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
141 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
142 | 21 | 21 | ||
143 | 22 | 22 | ||
144 | 23 | Column { | 23 | Column { |
145 | 24 | 24 | ||
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 | 1 | /* | 1 | /* |
152 | 2 | * Copyright (C) 2012-2014 Canonical, Ltd. | 2 | * Copyright (C) 2012-2014, 2015 Canonical, Ltd. |
153 | 3 | * | 3 | * |
154 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
155 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
156 | @@ -14,8 +14,8 @@ | |||
157 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
158 | 15 | */ | 15 | */ |
159 | 16 | 16 | ||
162 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.4 |
163 | 18 | import Ubuntu.Components 1.1 | 18 | import Ubuntu.Components 1.2 |
164 | 19 | 19 | ||
165 | 20 | CheckBox { | 20 | CheckBox { |
166 | 21 | checked: root.selected | 21 | checked: root.selected |
167 | 22 | 22 | ||
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 | 1 | /* | 1 | /* |
174 | 2 | * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com> | 2 | * Copyright (C) 2014, 2015 Andrew Hayzen <ahayzen@gmail.com> |
175 | 3 | * Daniel Holm <d.holmen@gmail.com> | 3 | * Daniel Holm <d.holmen@gmail.com> |
176 | 4 | * Victor Thompson <victor.thompson@gmail.com> | 4 | * Victor Thompson <victor.thompson@gmail.com> |
177 | 5 | * | 5 | * |
178 | @@ -16,8 +16,8 @@ | |||
179 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
180 | 17 | */ | 17 | */ |
181 | 18 | 18 | ||
184 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
185 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
186 | 21 | 21 | ||
187 | 22 | Action { | 22 | Action { |
188 | 23 | id: removeAction | 23 | id: removeAction |
189 | 24 | 24 | ||
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 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
195 | 18 | */ | 18 | */ |
196 | 19 | 19 | ||
199 | 20 | import QtQuick 2.3 | 20 | import QtQuick 2.4 |
200 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
201 | 22 | 22 | ||
202 | 23 | 23 | ||
203 | 24 | Item { | 24 | Item { |
204 | 25 | 25 | ||
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 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
210 | 15 | */ | 15 | */ |
211 | 16 | 16 | ||
214 | 17 | import QtQuick 2.3 | 17 | import QtQuick 2.4 |
215 | 18 | import Ubuntu.Components 1.1 | 18 | import Ubuntu.Components 1.2 |
216 | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem |
217 | 20 | 20 | ||
218 | 21 | 21 | ||
219 | 22 | 22 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
225 | 17 | */ | 17 | */ |
226 | 18 | 18 | ||
229 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
230 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
231 | 21 | 21 | ||
232 | 22 | Rectangle { | 22 | Rectangle { |
233 | 23 | id: indicator | 23 | id: indicator |
234 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
240 | 17 | */ | 17 | */ |
241 | 18 | 18 | ||
244 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
245 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
246 | 21 | 21 | ||
247 | 22 | PageHeadState { | 22 | PageHeadState { |
248 | 23 | id: selectionState | 23 | id: selectionState |
249 | 24 | 24 | ||
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 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
255 | 18 | */ | 18 | */ |
256 | 19 | 19 | ||
259 | 20 | import QtQuick 2.3 | 20 | import QtQuick 2.4 |
260 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
261 | 22 | 22 | ||
262 | 23 | 23 | ||
263 | 24 | WeatherListView { | 24 | WeatherListView { |
264 | 25 | 25 | ||
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 | 1 | /* | 1 | /* |
271 | 2 | * Copyright (C) 2014 Canonical, Ltd. | 2 | * Copyright (C) 2014, 2015 Canonical, Ltd. |
272 | 3 | * | 3 | * |
273 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
274 | 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
275 | @@ -62,8 +62,8 @@ | |||
276 | 62 | 62 | ||
277 | 63 | */ | 63 | */ |
278 | 64 | 64 | ||
281 | 65 | import QtQuick 2.2 | 65 | import QtQuick 2.4 |
282 | 66 | import Ubuntu.Components 1.1 | 66 | import Ubuntu.Components 1.2 |
283 | 67 | 67 | ||
284 | 68 | Page { | 68 | Page { |
285 | 69 | id: page | 69 | id: page |
286 | 70 | 70 | ||
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 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
292 | 18 | */ | 18 | */ |
293 | 19 | 19 | ||
296 | 20 | import QtQuick 2.3 | 20 | import QtQuick 2.4 |
297 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
298 | 22 | import Ubuntu.Components.ListItems 0.1 as ListItem | 22 | import Ubuntu.Components.ListItems 0.1 as ListItem |
299 | 23 | 23 | ||
300 | 24 | 24 | ||
301 | 25 | 25 | ||
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 | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
307 | 18 | */ | 18 | */ |
308 | 19 | 19 | ||
311 | 20 | import QtQuick 2.3 | 20 | import QtQuick 2.4 |
312 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
313 | 22 | 22 | ||
314 | 23 | 23 | ||
315 | 24 | ListView { | 24 | ListView { |
316 | 25 | 25 | ||
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 | 16 | * Authored by: Martin Borho <martin@borho.net> | 16 | * Authored by: Martin Borho <martin@borho.net> |
322 | 17 | */ | 17 | */ |
323 | 18 | import QtQuick.LocalStorage 2.0 | 18 | import QtQuick.LocalStorage 2.0 |
325 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
326 | 20 | 20 | ||
327 | 21 | Item { | 21 | Item { |
328 | 22 | property var db: null | 22 | property var db: null |
329 | 23 | 23 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
335 | 17 | */ | 17 | */ |
336 | 18 | 18 | ||
338 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
339 | 20 | import Qt.labs.settings 1.0 | 20 | import Qt.labs.settings 1.0 |
341 | 21 | import Ubuntu.Components 1.1 | 21 | import Ubuntu.Components 1.2 |
342 | 22 | import "components" | 22 | import "components" |
343 | 23 | import "data" as Data | 23 | import "data" as Data |
344 | 24 | import "data/WeatherApi.js" as WeatherApi | 24 | import "data/WeatherApi.js" as WeatherApi |
345 | @@ -39,7 +39,6 @@ | |||
346 | 39 | 39 | ||
347 | 40 | backgroundColor: "#F5F5F5" | 40 | backgroundColor: "#F5F5F5" |
348 | 41 | 41 | ||
349 | 42 | useDeprecatedToolbar: false | ||
350 | 43 | anchorToKeyboard: true | 42 | anchorToKeyboard: true |
351 | 44 | 43 | ||
352 | 45 | signal listItemSwiping(int i) | 44 | signal listItemSwiping(int i) |
353 | 46 | 45 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
359 | 17 | */ | 17 | */ |
360 | 18 | 18 | ||
363 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
364 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
365 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem |
366 | 22 | import Ubuntu.Components.Popups 1.0 | 22 | import Ubuntu.Components.Popups 1.0 |
367 | 23 | import "../components" | 23 | import "../components" |
368 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
374 | 17 | */ | 17 | */ |
375 | 18 | 18 | ||
378 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
379 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
380 | 21 | import "../components" | 21 | import "../components" |
381 | 22 | 22 | ||
382 | 23 | 23 | ||
383 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
389 | 17 | */ | 17 | */ |
390 | 18 | 18 | ||
393 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
394 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
395 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
396 | 22 | import "../components" | 22 | import "../components" |
397 | 23 | 23 | ||
398 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
404 | 17 | */ | 17 | */ |
405 | 18 | 18 | ||
408 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
409 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
410 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
411 | 22 | import "../components" | 22 | import "../components" |
412 | 23 | import "../components/ListItemActions" | 23 | import "../components/ListItemActions" |
413 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
419 | 17 | */ | 17 | */ |
420 | 18 | 18 | ||
423 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
424 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
425 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
426 | 22 | 22 | ||
427 | 23 | Page { | 23 | Page { |
428 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
434 | 17 | */ | 17 | */ |
435 | 18 | 18 | ||
438 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
439 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
440 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
441 | 22 | import "../../components" | 22 | import "../../components" |
442 | 23 | 23 | ||
443 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
449 | 17 | */ | 17 | */ |
450 | 18 | 18 | ||
453 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
454 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
455 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
456 | 22 | import "../../components" | 22 | import "../../components" |
457 | 23 | 23 | ||
458 | 24 | 24 | ||
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 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
464 | 17 | */ | 17 | */ |
465 | 18 | 18 | ||
468 | 19 | import QtQuick 2.3 | 19 | import QtQuick 2.4 |
469 | 20 | import Ubuntu.Components 1.1 | 20 | import Ubuntu.Components 1.2 |
470 | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem | 21 | import Ubuntu.Components.ListItems 0.1 as ListItem |
471 | 22 | import "../../components" | 22 | import "../../components" |
472 | 23 | 23 | ||
473 | 24 | 24 | ||
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 | 1 | { | 1 | { |
479 | 2 | "architecture": "all", | 2 | "architecture": "all", |
480 | 3 | "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources", | 3 | "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources", |
482 | 4 | "framework": "ubuntu-sdk-14.10-qml", | 4 | "framework": "ubuntu-sdk-15.04-qml", |
483 | 5 | "hooks": { | 5 | "hooks": { |
484 | 6 | "weather": { | 6 | "weather": { |
485 | 7 | "apparmor": "ubuntu-weather-app.apparmor", | 7 | "apparmor": "ubuntu-weather-app.apparmor", |
486 | 8 | 8 | ||
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 | 8 | msgstr "" | 8 | msgstr "" |
492 | 9 | "Project-Id-Version: ubuntu-weather-app\n" | 9 | "Project-Id-Version: ubuntu-weather-app\n" |
493 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
495 | 11 | "POT-Creation-Date: 2015-06-05 18:04-0500\n" | 11 | "POT-Creation-Date: 2015-06-09 19:05-0500\n" |
496 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
497 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
498 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
499 | 15 | 15 | ||
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 | 4 | "networking", | 4 | "networking", |
505 | 5 | "sensors" | 5 | "sensors" |
506 | 6 | ], | 6 | ], |
508 | 7 | "policy_version": 1.2 | 7 | "policy_version": 1.3 |
509 | 8 | } | 8 | } |
PASSED: Continuous integration, rev:53 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/115/ 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- utopic- amd64-ci/ 85 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- vivid-amd64- ci/115
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/115/ rebuild
http://