Ubuntu Clock App

Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework into lp:ubuntu-clock-app

  1. 1-migrate-to-15.04-framework
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 273
Merged at revision: 300
Proposed branch: lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework
Merge into: lp:ubuntu-clock-app
Diff against target: 764 lines (+87/-92)
48 files modified
app/alarm/AlarmDelegate.qml (+2/-2)
app/alarm/AlarmLabel.qml (+2/-2)
app/alarm/AlarmList.qml (+2/-2)
app/alarm/AlarmModelComponent.qml (+2/-2)
app/alarm/AlarmPage.qml (+2/-2)
app/alarm/AlarmRepeat.qml (+2/-2)
app/alarm/AlarmSettingsPage.qml (+2/-2)
app/alarm/AlarmSound.qml (+2/-2)
app/alarm/AlarmUtils.qml (+2/-2)
app/alarm/EditAlarmPage.qml (+2/-2)
app/clock/ClockPage.qml (+2/-2)
app/clock/MainClock.qml (+2/-2)
app/components/AnalogMode.qml (+2/-2)
app/components/AnalogShadow.qml (+2/-2)
app/components/Background.qml (+2/-2)
app/components/Clock.qml (+2/-2)
app/components/ClockCircle.qml (+2/-2)
app/components/DigitalMode.qml (+2/-2)
app/components/DigitalShadow.qml (+2/-2)
app/components/EmptyState.qml (+2/-2)
app/components/ExpandableListItem.qml (+2/-2)
app/components/HeaderButton.qml (+2/-2)
app/components/Shadow.qml (+2/-2)
app/components/SubtitledListItem.qml (+2/-2)
app/ubuntu-clock-app.qml (+2/-3)
app/upstreamcomponents/FakeHeader.qml (+2/-2)
app/upstreamcomponents/FastScroll.qml (+2/-2)
app/upstreamcomponents/ListItemWithActions.qml (+2/-2)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+2/-2)
app/upstreamcomponents/MultipleSelectionListView.qml (+2/-2)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+1/-1)
app/worldclock/AddWorldCityButton.qml (+2/-2)
app/worldclock/UserWorldCityDelegate.qml (+2/-2)
app/worldclock/UserWorldCityList.qml (+2/-2)
app/worldclock/WorldCityList.qml (+2/-2)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
po/com.ubuntu.clock.pot (+1/-1)
tests/unit/ClockTestCase.qml (+1/-1)
tests/unit/MockClockApp.qml (+2/-3)
tests/unit/tst_alarm.qml (+2/-3)
tests/unit/tst_alarmLabel.qml (+2/-3)
tests/unit/tst_alarmRepeat.qml (+1/-2)
tests/unit/tst_alarmSound.qml (+2/-3)
tests/unit/tst_alarmUtils.qml (+2/-2)
tests/unit/tst_worldClock.qml (+1/-1)
ubuntu-clock-app.json (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/1-migrate-to-15.04-framework
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Needs Fixing
Review via email: mp+263885@code.launchpad.net

Commit message

Migrate to ubuntu 15.04 sdk framework and QtQuick 2.4

Description of the change

This MP implements the following,
- Migrate to the ubuntu-sdk-15.04 framework
- Migrate to QtQuick 2.4

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

#blocked

This MP is blocked until,

- Jenkins moves to Vivid since we need QtQuick 2.4 and Ubuntu.Components 1.2 which is not available in utopic.

- AP tests needs to be updated similar to what has been done here [1]. However I am unable to figure out how to fix it after trying for a few days.

[1] https://code.launchpad.net/~ahayzen/music-app/refactor-bump-framework-1504/+merge/258126
[2] Couple of qml tests failing constantly

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

FAILED: Continuous integration, rev:273
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/681/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/27/console

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

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

FAILED: Continuous integration, rev:273
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/692/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/692/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 'app/alarm/AlarmDelegate.qml'
2--- app/alarm/AlarmDelegate.qml 2015-06-14 17:15:55 +0000
3+++ app/alarm/AlarmDelegate.qml 2015-07-06 10:47:12 +0000
4@@ -16,8 +16,8 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.3
9-import Ubuntu.Components 1.1
10+import QtQuick 2.4
11+import Ubuntu.Components 1.2
12 import "../upstreamcomponents"
13
14 ListItemWithActions {
15
16=== modified file 'app/alarm/AlarmLabel.qml'
17--- app/alarm/AlarmLabel.qml 2014-09-21 13:20:37 +0000
18+++ app/alarm/AlarmLabel.qml 2015-07-06 10:47:12 +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
28 Page {
29 id: _alarmLabelPage
30
31=== modified file 'app/alarm/AlarmList.qml'
32--- app/alarm/AlarmList.qml 2015-03-06 17:11:42 +0000
33+++ app/alarm/AlarmList.qml 2015-07-06 10:47:12 +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 import "../components"
44 import "../upstreamcomponents"
45
46=== modified file 'app/alarm/AlarmModelComponent.qml'
47--- app/alarm/AlarmModelComponent.qml 2014-10-10 19:58:31 +0000
48+++ app/alarm/AlarmModelComponent.qml 2015-07-06 10:47:12 +0000
49@@ -16,8 +16,8 @@
50 * along with this program. If not, see <http://www.gnu.org/licenses/>.
51 */
52
53-import QtQuick 2.3
54-import Ubuntu.Components 1.1
55+import QtQuick 2.4
56+import Ubuntu.Components 1.2
57
58 AlarmModel {
59 id: alarmModel
60
61=== modified file 'app/alarm/AlarmPage.qml'
62--- app/alarm/AlarmPage.qml 2015-04-14 11:57:10 +0000
63+++ app/alarm/AlarmPage.qml 2015-07-06 10:47:12 +0000
64@@ -16,8 +16,8 @@
65 * along with this program. If not, see <http://www.gnu.org/licenses/>.
66 */
67
68-import QtQuick 2.3
69-import Ubuntu.Components 1.1
70+import QtQuick 2.4
71+import Ubuntu.Components 1.2
72 import "../components"
73
74 Page {
75
76=== modified file 'app/alarm/AlarmRepeat.qml'
77--- app/alarm/AlarmRepeat.qml 2015-02-22 04:33:04 +0000
78+++ app/alarm/AlarmRepeat.qml 2015-07-06 10:47:12 +0000
79@@ -16,8 +16,8 @@
80 * along with this program. If not, see <http://www.gnu.org/licenses/>.
81 */
82
83-import QtQuick 2.3
84-import Ubuntu.Components 1.1
85+import QtQuick 2.4
86+import Ubuntu.Components 1.2
87 import Ubuntu.Components.ListItems 1.0 as ListItem
88
89 Page {
90
91=== modified file 'app/alarm/AlarmSettingsPage.qml'
92--- app/alarm/AlarmSettingsPage.qml 2015-03-13 16:55:52 +0000
93+++ app/alarm/AlarmSettingsPage.qml 2015-07-06 10:47:12 +0000
94@@ -16,10 +16,10 @@
95 * along with this program. If not, see <http://www.gnu.org/licenses/>.
96 */
97
98-import QtQuick 2.3
99+import QtQuick 2.4
100 import DateTime 1.0
101 import Alarm.Settings 1.0
102-import Ubuntu.Components 1.1
103+import Ubuntu.Components 1.2
104 import Ubuntu.Components.ListItems 1.0 as ListItem
105 import "../components"
106
107
108=== modified file 'app/alarm/AlarmSound.qml'
109--- app/alarm/AlarmSound.qml 2015-03-06 01:09:21 +0000
110+++ app/alarm/AlarmSound.qml 2015-07-06 10:47:12 +0000
111@@ -16,9 +16,9 @@
112 * along with this program. If not, see <http://www.gnu.org/licenses/>.
113 */
114
115-import QtQuick 2.3
116+import QtQuick 2.4
117 import QtMultimedia 5.0
118-import Ubuntu.Components 1.1
119+import Ubuntu.Components 1.2
120 import Ubuntu.Components.ListItems 1.0 as ListItem
121
122 Page {
123
124=== modified file 'app/alarm/AlarmUtils.qml'
125--- app/alarm/AlarmUtils.qml 2014-11-17 16:11:18 +0000
126+++ app/alarm/AlarmUtils.qml 2015-07-06 10:47:12 +0000
127@@ -16,8 +16,8 @@
128 * along with this program. If not, see <http://www.gnu.org/licenses/>.
129 */
130
131-import QtQuick 2.3
132-import Ubuntu.Components 1.1
133+import QtQuick 2.4
134+import Ubuntu.Components 1.2
135
136 /*
137 Qt Object containing a collection of useful alarm functions
138
139=== modified file 'app/alarm/EditAlarmPage.qml'
140--- app/alarm/EditAlarmPage.qml 2015-03-06 17:11:42 +0000
141+++ app/alarm/EditAlarmPage.qml 2015-07-06 10:47:12 +0000
142@@ -16,9 +16,9 @@
143 * along with this program. If not, see <http://www.gnu.org/licenses/>.
144 */
145
146-import QtQuick 2.3
147+import QtQuick 2.4
148 import DateTime 1.0
149-import Ubuntu.Components 1.1
150+import Ubuntu.Components 1.2
151 import Qt.labs.folderlistmodel 2.1
152 import Ubuntu.Components.Pickers 1.0
153 import Ubuntu.Components.ListItems 1.0 as ListItem
154
155=== modified file 'app/clock/ClockPage.qml'
156--- app/clock/ClockPage.qml 2015-05-15 16:38:24 +0000
157+++ app/clock/ClockPage.qml 2015-07-06 10:47:12 +0000
158@@ -16,10 +16,10 @@
159 * along with this program. If not, see <http://www.gnu.org/licenses/>.
160 */
161
162-import QtQuick 2.3
163+import QtQuick 2.4
164 import U1db 1.0 as U1db
165 import QtPositioning 5.2
166-import Ubuntu.Components 1.1
167+import Ubuntu.Components 1.2
168 import GeoLocation 1.0
169 import "../alarm"
170 import "../components"
171
172=== modified file 'app/clock/MainClock.qml'
173--- app/clock/MainClock.qml 2015-01-22 00:11:57 +0000
174+++ app/clock/MainClock.qml 2015-07-06 10:47:12 +0000
175@@ -16,8 +16,8 @@
176 * along with this program. If not, see <http://www.gnu.org/licenses/>.
177 */
178
179-import QtQuick 2.3
180-import Ubuntu.Components 1.1
181+import QtQuick 2.4
182+import Ubuntu.Components 1.2
183 import "../components"
184
185 Clock {
186
187=== modified file 'app/components/AnalogMode.qml'
188--- app/components/AnalogMode.qml 2014-10-10 19:58:49 +0000
189+++ app/components/AnalogMode.qml 2015-07-06 10:47:12 +0000
190@@ -16,8 +16,8 @@
191 * along with this program. If not, see <http://www.gnu.org/licenses/>.
192 */
193
194-import QtQuick 2.3
195-import Ubuntu.Components 1.1
196+import QtQuick 2.4
197+import Ubuntu.Components 1.2
198
199 ClockCircle {
200 id: _innerCircleAnalog
201
202=== modified file 'app/components/AnalogShadow.qml'
203--- app/components/AnalogShadow.qml 2014-09-06 15:16:43 +0000
204+++ app/components/AnalogShadow.qml 2015-07-06 10:47:12 +0000
205@@ -16,8 +16,8 @@
206 * along with this program. If not, see <http://www.gnu.org/licenses/>.
207 */
208
209-import QtQuick 2.3
210-import Ubuntu.Components 1.1
211+import QtQuick 2.4
212+import Ubuntu.Components 1.2
213
214 Flipable {
215 id: analogShadow
216
217=== modified file 'app/components/Background.qml'
218--- app/components/Background.qml 2014-10-10 23:00:40 +0000
219+++ app/components/Background.qml 2015-07-06 10:47:12 +0000
220@@ -16,8 +16,8 @@
221 * along with this program. If not, see <http://www.gnu.org/licenses/>.
222 */
223
224-import QtQuick 2.3
225-import Ubuntu.Components 1.1
226+import QtQuick 2.4
227+import Ubuntu.Components 1.2
228
229 /*
230 Component to set the background of the app
231
232=== modified file 'app/components/Clock.qml'
233--- app/components/Clock.qml 2014-10-03 11:40:54 +0000
234+++ app/components/Clock.qml 2015-07-06 10:47:12 +0000
235@@ -16,8 +16,8 @@
236 * along with this program. If not, see <http://www.gnu.org/licenses/>.
237 */
238
239-import QtQuick 2.3
240-import Ubuntu.Components 1.1
241+import QtQuick 2.4
242+import Ubuntu.Components 1.2
243
244 /*
245 Generic clock component which has a digital and analog mode. A flip animation
246
247=== modified file 'app/components/ClockCircle.qml'
248--- app/components/ClockCircle.qml 2014-10-16 21:31:16 +0000
249+++ app/components/ClockCircle.qml 2015-07-06 10:47:12 +0000
250@@ -16,8 +16,8 @@
251 * along with this program. If not, see <http://www.gnu.org/licenses/>.
252 */
253
254-import QtQuick 2.3
255-import Ubuntu.Components 1.1
256+import QtQuick 2.4
257+import Ubuntu.Components 1.2
258 import QtGraphicalEffects 1.0
259
260 /*
261
262=== modified file 'app/components/DigitalMode.qml'
263--- app/components/DigitalMode.qml 2015-05-26 10:09:24 +0000
264+++ app/components/DigitalMode.qml 2015-07-06 10:47:12 +0000
265@@ -16,8 +16,8 @@
266 * along with this program. If not, see <http://www.gnu.org/licenses/>.
267 */
268
269-import QtQuick 2.3
270-import Ubuntu.Components 1.1
271+import QtQuick 2.4
272+import Ubuntu.Components 1.2
273
274 ClockCircle {
275 id: _innerCircle
276
277=== modified file 'app/components/DigitalShadow.qml'
278--- app/components/DigitalShadow.qml 2014-09-06 15:16:43 +0000
279+++ app/components/DigitalShadow.qml 2015-07-06 10:47:12 +0000
280@@ -16,8 +16,8 @@
281 * along with this program. If not, see <http://www.gnu.org/licenses/>.
282 */
283
284-import QtQuick 2.3
285-import Ubuntu.Components 1.1
286+import QtQuick 2.4
287+import Ubuntu.Components 1.2
288
289 Flipable {
290 id: digitalShadow
291
292=== modified file 'app/components/EmptyState.qml'
293--- app/components/EmptyState.qml 2015-05-26 14:38:54 +0000
294+++ app/components/EmptyState.qml 2015-07-06 10:47:12 +0000
295@@ -16,8 +16,8 @@
296 * along with this program. If not, see <http://www.gnu.org/licenses/>.
297 */
298
299-import QtQuick 2.3
300-import Ubuntu.Components 1.1
301+import QtQuick 2.4
302+import Ubuntu.Components 1.2
303
304 /*
305 Component which displays an empty state (approved by design). It offers an
306
307=== modified file 'app/components/ExpandableListItem.qml'
308--- app/components/ExpandableListItem.qml 2015-03-13 18:56:45 +0000
309+++ app/components/ExpandableListItem.qml 2015-07-06 10:47:12 +0000
310@@ -16,8 +16,8 @@
311 * along with this program. If not, see <http://www.gnu.org/licenses/>.
312 */
313
314-import QtQuick 2.3
315-import Ubuntu.Components 1.1
316+import QtQuick 2.4
317+import Ubuntu.Components 1.2
318 import Ubuntu.Components.ListItems 1.0 as ListItem
319
320 /*
321
322=== modified file 'app/components/HeaderButton.qml'
323--- app/components/HeaderButton.qml 2014-09-17 14:35:13 +0000
324+++ app/components/HeaderButton.qml 2015-07-06 10:47:12 +0000
325@@ -16,8 +16,8 @@
326 * along with this program. If not, see <http://www.gnu.org/licenses/>.
327 */
328
329-import QtQuick 2.3
330-import Ubuntu.Components 1.1
331+import QtQuick 2.4
332+import Ubuntu.Components 1.2
333
334 AbstractButton {
335 id: headerButton
336
337=== modified file 'app/components/Shadow.qml'
338--- app/components/Shadow.qml 2014-08-24 12:47:50 +0000
339+++ app/components/Shadow.qml 2015-07-06 10:47:12 +0000
340@@ -16,8 +16,8 @@
341 * along with this program. If not, see <http://www.gnu.org/licenses/>.
342 */
343
344-import QtQuick 2.3
345-import Ubuntu.Components 1.1
346+import QtQuick 2.4
347+import Ubuntu.Components 1.2
348
349 Item {
350 id: _shadowContainer
351
352=== modified file 'app/components/SubtitledListItem.qml'
353--- app/components/SubtitledListItem.qml 2014-10-15 20:43:45 +0000
354+++ app/components/SubtitledListItem.qml 2015-07-06 10:47:12 +0000
355@@ -16,8 +16,8 @@
356 * along with this program. If not, see <http://www.gnu.org/licenses/>.
357 */
358
359-import QtQuick 2.3
360-import Ubuntu.Components 1.1
361+import QtQuick 2.4
362+import Ubuntu.Components 1.2
363 import Ubuntu.Components.ListItems 1.0 as ListItem
364
365 /*
366
367=== modified file 'app/ubuntu-clock-app.qml'
368--- app/ubuntu-clock-app.qml 2015-01-22 00:11:57 +0000
369+++ app/ubuntu-clock-app.qml 2015-07-06 10:47:12 +0000
370@@ -16,10 +16,10 @@
371 * along with this program. If not, see <http://www.gnu.org/licenses/>.
372 */
373
374-import QtQuick 2.3
375+import QtQuick 2.4
376 import DateTime 1.0
377 import U1db 1.0 as U1db
378-import Ubuntu.Components 1.1
379+import Ubuntu.Components 1.2
380 import "clock"
381 import "components"
382
383@@ -51,7 +51,6 @@
384
385 backgroundColor: "#F5F5F5"
386
387- useDeprecatedToolbar: false
388 anchorToKeyboard: true
389
390 Background {}
391
392=== modified file 'app/upstreamcomponents/FakeHeader.qml'
393--- app/upstreamcomponents/FakeHeader.qml 2014-09-01 19:33:42 +0000
394+++ app/upstreamcomponents/FakeHeader.qml 2015-07-06 10:47:12 +0000
395@@ -16,8 +16,8 @@
396 * along with this program. If not, see <http://www.gnu.org/licenses/>.
397 */
398
399-import QtQuick 2.3
400-import Ubuntu.Components 1.1
401+import QtQuick 2.4
402+import Ubuntu.Components 1.2
403
404 Column {
405 id: fakeHeader
406
407=== modified file 'app/upstreamcomponents/FastScroll.qml'
408--- app/upstreamcomponents/FastScroll.qml 2014-09-20 10:47:21 +0000
409+++ app/upstreamcomponents/FastScroll.qml 2015-07-06 10:47:12 +0000
410@@ -40,8 +40,8 @@
411 ****************************************************************************/
412
413 // FastScroll.qml
414-import QtQuick 2.3
415-import Ubuntu.Components 1.1
416+import QtQuick 2.4
417+import Ubuntu.Components 1.2
418 import "FastScroll.js" as Sections
419
420 Item {
421
422=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
423--- app/upstreamcomponents/ListItemWithActions.qml 2014-10-05 15:53:58 +0000
424+++ app/upstreamcomponents/ListItemWithActions.qml 2015-07-06 10:47:12 +0000
425@@ -14,8 +14,8 @@
426 * along with this program. If not, see <http://www.gnu.org/licenses/>.
427 */
428
429-import QtQuick 2.3
430-import Ubuntu.Components 1.1
431+import QtQuick 2.4
432+import Ubuntu.Components 1.2
433
434 Item {
435 id: root
436
437=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
438--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2014-09-20 10:47:21 +0000
439+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2015-07-06 10:47:12 +0000
440@@ -14,8 +14,8 @@
441 * along with this program. If not, see <http://www.gnu.org/licenses/>.
442 */
443
444-import QtQuick 2.3
445-import Ubuntu.Components 1.1
446+import QtQuick 2.4
447+import Ubuntu.Components 1.2
448
449 CheckBox {
450 checked: root.selected
451
452=== modified file 'app/upstreamcomponents/MultipleSelectionListView.qml'
453--- app/upstreamcomponents/MultipleSelectionListView.qml 2014-09-20 10:47:21 +0000
454+++ app/upstreamcomponents/MultipleSelectionListView.qml 2015-07-06 10:47:12 +0000
455@@ -14,8 +14,8 @@
456 * along with this program. If not, see <http://www.gnu.org/licenses/>.
457 */
458
459-import QtQuick 2.3
460-import Ubuntu.Components 1.1
461+import QtQuick 2.4
462+import Ubuntu.Components 1.2
463 import Ubuntu.Components.Popups 1.0 as Popups
464
465 /*!
466
467=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
468--- app/upstreamcomponents/MultipleSelectionVisualModel.qml 2014-09-20 10:47:21 +0000
469+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-07-06 10:47:12 +0000
470@@ -14,7 +14,7 @@
471 * along with this program. If not, see <http://www.gnu.org/licenses/>.
472 */
473
474-import QtQuick 2.3
475+import QtQuick 2.4
476
477 VisualDataModel {
478 id: contactVisualModel
479
480=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
481--- app/upstreamcomponents/PageWithBottomEdge.qml 2014-10-10 21:03:22 +0000
482+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-07-06 10:47:12 +0000
483@@ -63,7 +63,7 @@
484 */
485
486 import QtQuick 2.2
487-import Ubuntu.Components 1.1
488+import Ubuntu.Components 1.2
489
490 Page {
491 id: page
492
493=== modified file 'app/worldclock/AddWorldCityButton.qml'
494--- app/worldclock/AddWorldCityButton.qml 2014-09-19 11:30:40 +0000
495+++ app/worldclock/AddWorldCityButton.qml 2015-07-06 10:47:12 +0000
496@@ -16,8 +16,8 @@
497 * along with this program. If not, see <http://www.gnu.org/licenses/>.
498 */
499
500-import QtQuick 2.3
501-import Ubuntu.Components 1.1
502+import QtQuick 2.4
503+import Ubuntu.Components 1.2
504 import "../components"
505
506 AbstractButton {
507
508=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
509--- app/worldclock/UserWorldCityDelegate.qml 2015-04-06 13:33:55 +0000
510+++ app/worldclock/UserWorldCityDelegate.qml 2015-07-06 10:47:12 +0000
511@@ -16,8 +16,8 @@
512 * along with this program. If not, see <http://www.gnu.org/licenses/>.
513 */
514
515-import QtQuick 2.3
516-import Ubuntu.Components 1.1
517+import QtQuick 2.4
518+import Ubuntu.Components 1.2
519 import "../components"
520 import "../upstreamcomponents"
521
522
523=== modified file 'app/worldclock/UserWorldCityList.qml'
524--- app/worldclock/UserWorldCityList.qml 2014-10-03 11:40:54 +0000
525+++ app/worldclock/UserWorldCityList.qml 2015-07-06 10:47:12 +0000
526@@ -16,10 +16,10 @@
527 * along with this program. If not, see <http://www.gnu.org/licenses/>.
528 */
529
530-import QtQuick 2.3
531+import QtQuick 2.4
532 import Timezone 1.0
533 import U1db 1.0 as U1db
534-import Ubuntu.Components 1.1
535+import Ubuntu.Components 1.2
536
537 Column {
538 id: worldCityColumn
539
540=== modified file 'app/worldclock/WorldCityList.qml'
541--- app/worldclock/WorldCityList.qml 2015-06-18 18:13:54 +0000
542+++ app/worldclock/WorldCityList.qml 2015-07-06 10:47:12 +0000
543@@ -16,9 +16,9 @@
544 * along with this program. If not, see <http://www.gnu.org/licenses/>.
545 */
546
547-import QtQuick 2.3
548+import QtQuick 2.4
549 import Timezone 1.0
550-import Ubuntu.Components 1.1
551+import Ubuntu.Components 1.2
552 import Ubuntu.Components.ListItems 1.0 as ListItem
553 import "../components"
554 import "../upstreamcomponents"
555
556=== modified file 'debian/changelog'
557--- debian/changelog 2015-06-19 18:40:57 +0000
558+++ debian/changelog 2015-07-06 10:47:12 +0000
559@@ -38,6 +38,7 @@
560 location access (LP: #1393827)
561 * Increased date font size (LP: #1432736)
562 * Fixed empty state component width warnings
563+ * Migrated to the 15.04 framework and also QtQuick 2.4
564 * Locked clock app orientation to portrait (LP: #1465457)
565
566 [themeles]
567
568=== modified file 'manifest.json.in'
569--- manifest.json.in 2015-06-18 18:13:54 +0000
570+++ manifest.json.in 2015-07-06 10:47:12 +0000
571@@ -1,7 +1,7 @@
572 {
573 "name": "com.ubuntu.clock",
574 "description": "A sophisticated clock app for Ubuntu Touch",
575- "framework": "ubuntu-sdk-14.10",
576+ "framework": "ubuntu-sdk-15.04",
577 "architecture": "@CLICK_ARCH@",
578 "title": "Clock",
579 "icon": "clock@30.png",
580
581=== modified file 'po/com.ubuntu.clock.pot'
582--- po/com.ubuntu.clock.pot 2015-06-18 18:13:54 +0000
583+++ po/com.ubuntu.clock.pot 2015-07-06 10:47:12 +0000
584@@ -8,7 +8,7 @@
585 msgstr ""
586 "Project-Id-Version: \n"
587 "Report-Msgid-Bugs-To: \n"
588-"POT-Creation-Date: 2015-06-18 18:12+0000\n"
589+"POT-Creation-Date: 2015-06-18 22:57+0000\n"
590 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
591 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
592 "Language-Team: LANGUAGE <LL@li.org>\n"
593
594=== modified file 'tests/unit/ClockTestCase.qml'
595--- tests/unit/ClockTestCase.qml 2014-10-14 16:01:30 +0000
596+++ tests/unit/ClockTestCase.qml 2015-07-06 10:47:12 +0000
597@@ -17,7 +17,7 @@
598 */
599
600 import QtTest 1.0
601-import QtQuick 2.3
602+import QtQuick 2.4
603 import Ubuntu.Test 1.0
604
605 /*
606
607=== modified file 'tests/unit/MockClockApp.qml'
608--- tests/unit/MockClockApp.qml 2014-10-28 13:19:46 +0000
609+++ tests/unit/MockClockApp.qml 2015-07-06 10:47:12 +0000
610@@ -16,10 +16,10 @@
611 * along with this program. If not, see <http://www.gnu.org/licenses/>.
612 */
613
614-import QtQuick 2.3
615+import QtQuick 2.4
616 import DateTime 1.0
617 import U1db 1.0 as U1db
618-import Ubuntu.Components 1.1
619+import Ubuntu.Components 1.2
620 import "../../app/clock"
621 import "../../app/components"
622
623@@ -37,7 +37,6 @@
624
625 width: units.gu(40)
626 height: units.gu(70)
627- useDeprecatedToolbar: false
628 applicationName: "com.ubuntu.fakeclock.test"
629
630 U1db.Database {
631
632=== modified file 'tests/unit/tst_alarm.qml'
633--- tests/unit/tst_alarm.qml 2014-10-14 09:45:06 +0000
634+++ tests/unit/tst_alarm.qml 2015-07-06 10:47:12 +0000
635@@ -16,9 +16,9 @@
636 * along with this program. If not, see <http://www.gnu.org/licenses/>.
637 */
638
639-import QtQuick 2.3
640+import QtQuick 2.4
641 import DateTime 1.0
642-import Ubuntu.Components 1.1
643+import Ubuntu.Components 1.2
644 import "../../app/alarm"
645
646 MainView {
647@@ -26,7 +26,6 @@
648
649 width: units.gu(40)
650 height: units.gu(70)
651- useDeprecatedToolbar: false
652
653 property var clockTime: new Date
654 (
655
656=== modified file 'tests/unit/tst_alarmLabel.qml'
657--- tests/unit/tst_alarmLabel.qml 2014-10-14 09:23:37 +0000
658+++ tests/unit/tst_alarmLabel.qml 2015-07-06 10:47:12 +0000
659@@ -16,8 +16,8 @@
660 * along with this program. If not, see <http://www.gnu.org/licenses/>.
661 */
662
663-import QtQuick 2.3
664-import Ubuntu.Components 1.1
665+import QtQuick 2.4
666+import Ubuntu.Components 1.2
667 import "../../app/alarm"
668
669 MainView {
670@@ -25,7 +25,6 @@
671
672 width: units.gu(40)
673 height: units.gu(70)
674- useDeprecatedToolbar: false
675
676 Alarm {
677 id: _alarm
678
679=== modified file 'tests/unit/tst_alarmRepeat.qml'
680--- tests/unit/tst_alarmRepeat.qml 2015-01-22 00:11:57 +0000
681+++ tests/unit/tst_alarmRepeat.qml 2015-07-06 10:47:12 +0000
682@@ -19,7 +19,7 @@
683 import QtQuick 2.0
684 import QtTest 1.0
685 import Ubuntu.Test 1.0
686-import Ubuntu.Components 1.1
687+import Ubuntu.Components 1.2
688 import "../../app/alarm"
689
690 MainView {
691@@ -27,7 +27,6 @@
692
693 width: units.gu(40)
694 height: units.gu(70)
695- useDeprecatedToolbar: false
696
697 Alarm {
698 id: _alarm
699
700=== modified file 'tests/unit/tst_alarmSound.qml'
701--- tests/unit/tst_alarmSound.qml 2014-09-25 20:16:40 +0000
702+++ tests/unit/tst_alarmSound.qml 2015-07-06 10:47:12 +0000
703@@ -16,10 +16,10 @@
704 * along with this program. If not, see <http://www.gnu.org/licenses/>.
705 */
706
707-import QtQuick 2.3
708+import QtQuick 2.4
709 import QtTest 1.0
710 import Ubuntu.Test 1.0
711-import Ubuntu.Components 1.1
712+import Ubuntu.Components 1.2
713 import Qt.labs.folderlistmodel 2.1
714 import "../../app/alarm"
715
716@@ -28,7 +28,6 @@
717
718 width: units.gu(40)
719 height: units.gu(70)
720- useDeprecatedToolbar: false
721
722 Alarm {
723 id: _alarm
724
725=== modified file 'tests/unit/tst_alarmUtils.qml'
726--- tests/unit/tst_alarmUtils.qml 2014-10-06 21:21:58 +0000
727+++ tests/unit/tst_alarmUtils.qml 2015-07-06 10:47:12 +0000
728@@ -16,9 +16,9 @@
729 * along with this program. If not, see <http://www.gnu.org/licenses/>.
730 */
731
732-import QtQuick 2.3
733+import QtQuick 2.4
734 import QtTest 1.0
735-import Ubuntu.Components 1.1
736+import Ubuntu.Components 1.2
737 import "../../app/alarm"
738
739 TestCase {
740
741=== modified file 'tests/unit/tst_worldClock.qml'
742--- tests/unit/tst_worldClock.qml 2014-10-14 11:33:23 +0000
743+++ tests/unit/tst_worldClock.qml 2015-07-06 10:47:12 +0000
744@@ -19,7 +19,7 @@
745 import QtQuick 2.0
746 import QtTest 1.0
747 import Ubuntu.Test 1.0
748-import Ubuntu.Components 1.1
749+import Ubuntu.Components 1.2
750
751 MockClockApp {
752 id: clockApp
753
754=== modified file 'ubuntu-clock-app.json'
755--- ubuntu-clock-app.json 2014-08-21 19:19:36 +0000
756+++ ubuntu-clock-app.json 2015-07-06 10:47:12 +0000
757@@ -5,5 +5,5 @@
758 "networking",
759 "location"
760 ],
761- "policy_version": 1.2
762+ "policy_version": 1.3
763 }
764\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: