Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 into lp:ubuntu-clock-app
- ubuntu-clock-app-uitk1.3
- Merge into trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Bartosz Kosiorek | ||||||||
Approved revision: | 406 | ||||||||
Merged at revision: | 421 | ||||||||
Proposed branch: | lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 | ||||||||
Merge into: | lp:ubuntu-clock-app | ||||||||
Diff against target: |
665 lines (+58/-54) 48 files modified
app/MainPage.qml (+4/-1) app/alarm/AlarmDelegate.qml (+1/-1) app/alarm/AlarmLabel.qml (+1/-1) app/alarm/AlarmList.qml (+1/-1) app/alarm/AlarmModelComponent.qml (+1/-1) app/alarm/AlarmPage.qml (+1/-1) app/alarm/AlarmRepeat.qml (+1/-1) app/alarm/AlarmSettingsPage.qml (+1/-1) app/alarm/AlarmSound.qml (+1/-1) app/alarm/AlarmUtils.qml (+1/-1) app/alarm/EditAlarmPage.qml (+2/-2) app/alarm/SoundPeerPicker.qml (+1/-1) app/clock/ClockPage.qml (+1/-1) app/clock/MainClock.qml (+1/-1) app/components/ActionIcon.qml (+1/-1) app/components/AnalogMode.qml (+1/-1) app/components/AnalogShadow.qml (+1/-1) app/components/Background.qml (+1/-1) app/components/Clock.qml (+1/-1) app/components/ClockCircle.qml (+1/-1) app/components/DigitalMode.qml (+1/-1) app/components/DigitalShadow.qml (+1/-1) app/components/EmptyState.qml (+1/-1) app/components/ExpandableListItem.qml (+2/-2) app/components/HeaderNavigation.qml (+1/-1) app/components/Shadow.qml (+1/-1) app/components/SubtitledListItem.qml (+1/-1) app/stopwatch/LapListView.qml (+1/-1) app/stopwatch/StopwatchFace.qml (+1/-1) app/stopwatch/StopwatchPage.qml (+1/-1) app/ubuntu-clock-app.qml (+1/-1) app/upstreamcomponents/FakeHeader.qml (+4/-4) app/upstreamcomponents/FastScroll.qml (+1/-1) app/upstreamcomponents/PageWithBottomEdge.qml (+3/-3) app/worldclock/AddWorldCityButton.qml (+1/-1) app/worldclock/UserWorldCityDelegate.qml (+1/-1) app/worldclock/UserWorldCityList.qml (+1/-1) app/worldclock/WorldCityList.qml (+1/-1) debian/changelog (+1/-0) manifest.json.in (+1/-1) tests/unit/MockClockApp.qml (+1/-1) tests/unit/tst_alarm.qml (+1/-1) tests/unit/tst_alarmLabel.qml (+1/-1) tests/unit/tst_alarmRepeat.qml (+1/-1) tests/unit/tst_alarmSound.qml (+1/-1) tests/unit/tst_alarmUtils.qml (+1/-1) tests/unit/tst_stopwatchUtils.qml (+1/-1) tests/unit/tst_worldClock.qml (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/ubuntu-clock-app-uitk1.3 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bartosz Kosiorek | Approve | ||
Jenkins Bot | continuous-integration | Approve | |
Victor Thompson | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Pending | |
Review via email: mp+276650@code.launchpad.net |
Commit message
* Update to the new SDK Ubuntu Components 1.3
Description of the change
* Update to the new SDK Ubuntu Components 1.3
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
Victor Thompson (vthompson) wrote : | # |
Bartosz, I hope you don't mind that I proposed this branch for merging. Clock, Weather, and Calculator will all have similar issues with the new header that I want us to work together on. Please see this MP [1] to provide comments as this relates to Weather.
Functionally, currently this change for clock causes part of the fake header to be shown at the top of the app. This will need coordination/
1 - https:/
- 403. By Bartosz Kosiorek
-
Hide header
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:403
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Victor Thompson (vthompson) wrote : | # |
Things that need to be looked into/fixed.
1. The old style header with the title "Clock" appears briefly when the app is started. This is similar to what we see in weather, but the weather app mp experiences the new header being momentarily shown, not the old header.
2. Exposing the bottom edge shows the old header while swiping and hitting "back"
3. The Settings action shows the old header after hitting "back"
Victor Thompson (vthompson) wrote : | # |
EditAlarmPage uses "import Ubuntu.
Do the tests need to be updated for any of this?
Victor Thompson (vthompson) wrote : | # |
Any updated progress on this MP?
Bartosz Kosiorek (gang65) wrote : | # |
Hello Victor.
Unfortunately I was unable to manage to fix these header issues.
Do you have idea how it could be fixed?
I changed owner of this branch, so you could submit to it.
- 404. By Victor Thompson
-
Fixing FakeHeader issues
- 405. By Victor Thompson
-
Merge of trunk and update changelog
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:405
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Victor Thompson (vthompson) wrote : | # |
Bartosz, I've fixed all the issues I had and updated the changelog.
- 406. By Victor Thompson
-
Fix manifest file as this is not a QML app.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:406
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Bartosz Kosiorek (gang65) wrote : | # |
Thanks Victor.
I found one small issue:
When I'm swiping page from the bottom edge to display alarm list, then header is moving up and down.
Could you please take a look at this?
It is not appear with previous SDK.
Victor Thompson (vthompson) wrote : | # |
The Weather app had and has the same issue--we were unable to resolve it. We (popey, ahayzen, and myself) determined it to be sufficient for now in that case.
Bartosz Kosiorek (gang65) wrote : | # |
Thanks. Let's merge it then.
Preview Diff
1 | === modified file 'app/MainPage.qml' | |||
2 | --- app/MainPage.qml 2015-10-06 22:02:45 +0000 | |||
3 | +++ app/MainPage.qml 2015-12-11 02:20:37 +0000 | |||
4 | @@ -17,7 +17,7 @@ | |||
5 | 17 | */ | 17 | */ |
6 | 18 | 18 | ||
7 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
9 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
10 | 21 | import QtSystemInfo 5.0 | 21 | import QtSystemInfo 5.0 |
11 | 22 | import Qt.labs.settings 1.0 | 22 | import Qt.labs.settings 1.0 |
12 | 23 | import "upstreamcomponents" | 23 | import "upstreamcomponents" |
13 | @@ -84,6 +84,9 @@ | |||
14 | 84 | } | 84 | } |
15 | 85 | } | 85 | } |
16 | 86 | 86 | ||
17 | 87 | head.visible: false | ||
18 | 88 | head.locked: true | ||
19 | 89 | |||
20 | 87 | HeaderNavigation { | 90 | HeaderNavigation { |
21 | 88 | id: headerRow | 91 | id: headerRow |
22 | 89 | 92 | ||
23 | 90 | 93 | ||
24 | === modified file 'app/alarm/AlarmDelegate.qml' | |||
25 | --- app/alarm/AlarmDelegate.qml 2015-10-27 22:49:37 +0000 | |||
26 | +++ app/alarm/AlarmDelegate.qml 2015-12-11 02:20:37 +0000 | |||
27 | @@ -18,7 +18,7 @@ | |||
28 | 18 | 18 | ||
29 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
30 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
32 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
33 | 22 | 22 | ||
34 | 23 | ListItem { | 23 | ListItem { |
35 | 24 | id: root | 24 | id: root |
36 | 25 | 25 | ||
37 | === modified file 'app/alarm/AlarmLabel.qml' | |||
38 | --- app/alarm/AlarmLabel.qml 2015-08-13 13:29:49 +0000 | |||
39 | +++ app/alarm/AlarmLabel.qml 2015-12-11 02:20:37 +0000 | |||
40 | @@ -17,7 +17,7 @@ | |||
41 | 17 | */ | 17 | */ |
42 | 18 | 18 | ||
43 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
45 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
46 | 21 | 21 | ||
47 | 22 | Page { | 22 | Page { |
48 | 23 | id: _alarmLabelPage | 23 | id: _alarmLabelPage |
49 | 24 | 24 | ||
50 | === modified file 'app/alarm/AlarmList.qml' | |||
51 | --- app/alarm/AlarmList.qml 2015-08-25 11:26:57 +0000 | |||
52 | +++ app/alarm/AlarmList.qml 2015-12-11 02:20:37 +0000 | |||
53 | @@ -17,7 +17,7 @@ | |||
54 | 17 | */ | 17 | */ |
55 | 18 | 18 | ||
56 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
58 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
59 | 21 | 21 | ||
60 | 22 | UbuntuListView { | 22 | UbuntuListView { |
61 | 23 | id: alarmListView | 23 | id: alarmListView |
62 | 24 | 24 | ||
63 | === modified file 'app/alarm/AlarmModelComponent.qml' | |||
64 | --- app/alarm/AlarmModelComponent.qml 2015-08-14 05:34:49 +0000 | |||
65 | +++ app/alarm/AlarmModelComponent.qml 2015-12-11 02:20:37 +0000 | |||
66 | @@ -17,7 +17,7 @@ | |||
67 | 17 | */ | 17 | */ |
68 | 18 | 18 | ||
69 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
71 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
72 | 21 | 21 | ||
73 | 22 | AlarmModel { | 22 | AlarmModel { |
74 | 23 | id: alarmModel | 23 | id: alarmModel |
75 | 24 | 24 | ||
76 | === modified file 'app/alarm/AlarmPage.qml' | |||
77 | --- app/alarm/AlarmPage.qml 2015-10-08 21:49:48 +0000 | |||
78 | +++ app/alarm/AlarmPage.qml 2015-12-11 02:20:37 +0000 | |||
79 | @@ -17,7 +17,7 @@ | |||
80 | 17 | */ | 17 | */ |
81 | 18 | 18 | ||
82 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
84 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
85 | 21 | 21 | ||
86 | 22 | Page { | 22 | Page { |
87 | 23 | id: alarmPage | 23 | id: alarmPage |
88 | 24 | 24 | ||
89 | === modified file 'app/alarm/AlarmRepeat.qml' | |||
90 | --- app/alarm/AlarmRepeat.qml 2015-08-13 13:29:49 +0000 | |||
91 | +++ app/alarm/AlarmRepeat.qml 2015-12-11 02:20:37 +0000 | |||
92 | @@ -17,7 +17,7 @@ | |||
93 | 17 | */ | 17 | */ |
94 | 18 | 18 | ||
95 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
97 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
98 | 21 | 21 | ||
99 | 22 | Page { | 22 | Page { |
100 | 23 | id: _alarmRepeatPage | 23 | id: _alarmRepeatPage |
101 | 24 | 24 | ||
102 | === modified file 'app/alarm/AlarmSettingsPage.qml' | |||
103 | --- app/alarm/AlarmSettingsPage.qml 2015-10-06 21:22:34 +0000 | |||
104 | +++ app/alarm/AlarmSettingsPage.qml 2015-12-11 02:20:37 +0000 | |||
105 | @@ -20,7 +20,7 @@ | |||
106 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
107 | 21 | import WorldClock 1.0 | 21 | import WorldClock 1.0 |
108 | 22 | import Alarm 1.0 | 22 | import Alarm 1.0 |
110 | 23 | import Ubuntu.Components 1.2 | 23 | import Ubuntu.Components 1.3 |
111 | 24 | import "../components" | 24 | import "../components" |
112 | 25 | 25 | ||
113 | 26 | Page { | 26 | Page { |
114 | 27 | 27 | ||
115 | === modified file 'app/alarm/AlarmSound.qml' | |||
116 | --- app/alarm/AlarmSound.qml 2015-10-21 12:18:35 +0000 | |||
117 | +++ app/alarm/AlarmSound.qml 2015-12-11 02:20:37 +0000 | |||
118 | @@ -20,7 +20,7 @@ | |||
119 | 20 | import Alarm 1.0 | 20 | import Alarm 1.0 |
120 | 21 | import QtMultimedia 5.0 | 21 | import QtMultimedia 5.0 |
121 | 22 | import Ubuntu.Content 1.1 | 22 | import Ubuntu.Content 1.1 |
123 | 23 | import Ubuntu.Components 1.2 | 23 | import Ubuntu.Components 1.3 |
124 | 24 | import QtQuick.Layouts 1.1 | 24 | import QtQuick.Layouts 1.1 |
125 | 25 | import Qt.labs.folderlistmodel 2.1 | 25 | import Qt.labs.folderlistmodel 2.1 |
126 | 26 | 26 | ||
127 | 27 | 27 | ||
128 | === modified file 'app/alarm/AlarmUtils.qml' | |||
129 | --- app/alarm/AlarmUtils.qml 2015-10-27 22:49:37 +0000 | |||
130 | +++ app/alarm/AlarmUtils.qml 2015-12-11 02:20:37 +0000 | |||
131 | @@ -17,7 +17,7 @@ | |||
132 | 17 | */ | 17 | */ |
133 | 18 | 18 | ||
134 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
136 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
137 | 21 | 21 | ||
138 | 22 | /* | 22 | /* |
139 | 23 | Qt Object containing a collection of useful alarm functions | 23 | Qt Object containing a collection of useful alarm functions |
140 | 24 | 24 | ||
141 | === modified file 'app/alarm/EditAlarmPage.qml' | |||
142 | --- app/alarm/EditAlarmPage.qml 2015-10-08 21:49:48 +0000 | |||
143 | +++ app/alarm/EditAlarmPage.qml 2015-12-11 02:20:37 +0000 | |||
144 | @@ -19,8 +19,8 @@ | |||
145 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
146 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
147 | 21 | import Alarm 1.0 | 21 | import Alarm 1.0 |
150 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
151 | 23 | import Ubuntu.Components.Pickers 1.0 | 23 | import Ubuntu.Components.Pickers 1.3 |
152 | 24 | import "../components" | 24 | import "../components" |
153 | 25 | 25 | ||
154 | 26 | Page { | 26 | Page { |
155 | 27 | 27 | ||
156 | === modified file 'app/alarm/SoundPeerPicker.qml' | |||
157 | --- app/alarm/SoundPeerPicker.qml 2015-08-21 13:36:56 +0000 | |||
158 | +++ app/alarm/SoundPeerPicker.qml 2015-12-11 02:20:37 +0000 | |||
159 | @@ -17,7 +17,7 @@ | |||
160 | 17 | */ | 17 | */ |
161 | 18 | 18 | ||
162 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
164 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
165 | 21 | import Ubuntu.Content 1.1 | 21 | import Ubuntu.Content 1.1 |
166 | 22 | 22 | ||
167 | 23 | Page { | 23 | Page { |
168 | 24 | 24 | ||
169 | === modified file 'app/clock/ClockPage.qml' | |||
170 | --- app/clock/ClockPage.qml 2015-10-06 22:34:27 +0000 | |||
171 | +++ app/clock/ClockPage.qml 2015-12-11 02:20:37 +0000 | |||
172 | @@ -19,7 +19,7 @@ | |||
173 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
174 | 20 | import U1db 1.0 as U1db | 20 | import U1db 1.0 as U1db |
175 | 21 | import QtPositioning 5.2 | 21 | import QtPositioning 5.2 |
177 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
178 | 23 | import WorldClock 1.0 | 23 | import WorldClock 1.0 |
179 | 24 | import "../components" | 24 | import "../components" |
180 | 25 | import "../worldclock" | 25 | import "../worldclock" |
181 | 26 | 26 | ||
182 | === modified file 'app/clock/MainClock.qml' | |||
183 | --- app/clock/MainClock.qml 2015-05-27 16:03:23 +0000 | |||
184 | +++ app/clock/MainClock.qml 2015-12-11 02:20:37 +0000 | |||
185 | @@ -17,7 +17,7 @@ | |||
186 | 17 | */ | 17 | */ |
187 | 18 | 18 | ||
188 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
190 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
191 | 21 | import "../components" | 21 | import "../components" |
192 | 22 | 22 | ||
193 | 23 | Clock { | 23 | Clock { |
194 | 24 | 24 | ||
195 | === modified file 'app/components/ActionIcon.qml' | |||
196 | --- app/components/ActionIcon.qml 2015-08-20 15:46:48 +0000 | |||
197 | +++ app/components/ActionIcon.qml 2015-12-11 02:20:37 +0000 | |||
198 | @@ -17,7 +17,7 @@ | |||
199 | 17 | */ | 17 | */ |
200 | 18 | 18 | ||
201 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
203 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
204 | 21 | 21 | ||
205 | 22 | AbstractButton { | 22 | AbstractButton { |
206 | 23 | id: abstractButton | 23 | id: abstractButton |
207 | 24 | 24 | ||
208 | === modified file 'app/components/AnalogMode.qml' | |||
209 | --- app/components/AnalogMode.qml 2015-10-06 22:34:27 +0000 | |||
210 | +++ app/components/AnalogMode.qml 2015-12-11 02:20:37 +0000 | |||
211 | @@ -17,7 +17,7 @@ | |||
212 | 17 | */ | 17 | */ |
213 | 18 | 18 | ||
214 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
216 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
217 | 21 | 21 | ||
218 | 22 | ClockCircle { | 22 | ClockCircle { |
219 | 23 | id: _innerCircleAnalog | 23 | id: _innerCircleAnalog |
220 | 24 | 24 | ||
221 | === modified file 'app/components/AnalogShadow.qml' | |||
222 | --- app/components/AnalogShadow.qml 2015-08-14 05:34:49 +0000 | |||
223 | +++ app/components/AnalogShadow.qml 2015-12-11 02:20:37 +0000 | |||
224 | @@ -17,7 +17,7 @@ | |||
225 | 17 | */ | 17 | */ |
226 | 18 | 18 | ||
227 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
229 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
230 | 21 | 21 | ||
231 | 22 | Flipable { | 22 | Flipable { |
232 | 23 | id: analogShadow | 23 | id: analogShadow |
233 | 24 | 24 | ||
234 | === modified file 'app/components/Background.qml' | |||
235 | --- app/components/Background.qml 2015-08-14 05:34:49 +0000 | |||
236 | +++ app/components/Background.qml 2015-12-11 02:20:37 +0000 | |||
237 | @@ -17,7 +17,7 @@ | |||
238 | 17 | */ | 17 | */ |
239 | 18 | 18 | ||
240 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
242 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
243 | 21 | 21 | ||
244 | 22 | /* | 22 | /* |
245 | 23 | Component to set the background of the app | 23 | Component to set the background of the app |
246 | 24 | 24 | ||
247 | === modified file 'app/components/Clock.qml' | |||
248 | --- app/components/Clock.qml 2015-10-06 22:34:27 +0000 | |||
249 | +++ app/components/Clock.qml 2015-12-11 02:20:37 +0000 | |||
250 | @@ -17,7 +17,7 @@ | |||
251 | 17 | */ | 17 | */ |
252 | 18 | 18 | ||
253 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
255 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
256 | 21 | 21 | ||
257 | 22 | /* | 22 | /* |
258 | 23 | Generic clock component which has a digital and analog mode. A flip animation | 23 | Generic clock component which has a digital and analog mode. A flip animation |
259 | 24 | 24 | ||
260 | === modified file 'app/components/ClockCircle.qml' | |||
261 | --- app/components/ClockCircle.qml 2015-08-14 05:34:49 +0000 | |||
262 | +++ app/components/ClockCircle.qml 2015-12-11 02:20:37 +0000 | |||
263 | @@ -17,7 +17,7 @@ | |||
264 | 17 | */ | 17 | */ |
265 | 18 | 18 | ||
266 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
268 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
269 | 21 | import QtGraphicalEffects 1.0 | 21 | import QtGraphicalEffects 1.0 |
270 | 22 | 22 | ||
271 | 23 | /* | 23 | /* |
272 | 24 | 24 | ||
273 | === modified file 'app/components/DigitalMode.qml' | |||
274 | --- app/components/DigitalMode.qml 2015-09-16 15:13:36 +0000 | |||
275 | +++ app/components/DigitalMode.qml 2015-12-11 02:20:37 +0000 | |||
276 | @@ -17,7 +17,7 @@ | |||
277 | 17 | */ | 17 | */ |
278 | 18 | 18 | ||
279 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
281 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
282 | 21 | 21 | ||
283 | 22 | ClockCircle { | 22 | ClockCircle { |
284 | 23 | id: _innerCircle | 23 | id: _innerCircle |
285 | 24 | 24 | ||
286 | === modified file 'app/components/DigitalShadow.qml' | |||
287 | --- app/components/DigitalShadow.qml 2015-08-14 05:34:49 +0000 | |||
288 | +++ app/components/DigitalShadow.qml 2015-12-11 02:20:37 +0000 | |||
289 | @@ -17,7 +17,7 @@ | |||
290 | 17 | */ | 17 | */ |
291 | 18 | 18 | ||
292 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
294 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
295 | 21 | 21 | ||
296 | 22 | Flipable { | 22 | Flipable { |
297 | 23 | id: digitalShadow | 23 | id: digitalShadow |
298 | 24 | 24 | ||
299 | === modified file 'app/components/EmptyState.qml' | |||
300 | --- app/components/EmptyState.qml 2015-08-14 05:34:49 +0000 | |||
301 | +++ app/components/EmptyState.qml 2015-12-11 02:20:37 +0000 | |||
302 | @@ -17,7 +17,7 @@ | |||
303 | 17 | */ | 17 | */ |
304 | 18 | 18 | ||
305 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
307 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
308 | 21 | 21 | ||
309 | 22 | /* | 22 | /* |
310 | 23 | Component which displays an empty state (approved by design). It offers an | 23 | Component which displays an empty state (approved by design). It offers an |
311 | 24 | 24 | ||
312 | === modified file 'app/components/ExpandableListItem.qml' | |||
313 | --- app/components/ExpandableListItem.qml 2015-06-03 16:05:03 +0000 | |||
314 | +++ app/components/ExpandableListItem.qml 2015-12-11 02:20:37 +0000 | |||
315 | @@ -17,8 +17,8 @@ | |||
316 | 17 | */ | 17 | */ |
317 | 18 | 18 | ||
318 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
321 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
322 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
323 | 22 | 22 | ||
324 | 23 | /* | 23 | /* |
325 | 24 | Component which extends the SDK Expandable list item and provides a easy | 24 | Component which extends the SDK Expandable list item and provides a easy |
326 | 25 | 25 | ||
327 | === modified file 'app/components/HeaderNavigation.qml' | |||
328 | --- app/components/HeaderNavigation.qml 2015-09-11 13:13:17 +0000 | |||
329 | +++ app/components/HeaderNavigation.qml 2015-12-11 02:20:37 +0000 | |||
330 | @@ -17,7 +17,7 @@ | |||
331 | 17 | */ | 17 | */ |
332 | 18 | 18 | ||
333 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
335 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
336 | 21 | 21 | ||
337 | 22 | Item { | 22 | Item { |
338 | 23 | id: headerRow | 23 | id: headerRow |
339 | 24 | 24 | ||
340 | === modified file 'app/components/Shadow.qml' | |||
341 | --- app/components/Shadow.qml 2015-08-14 05:34:49 +0000 | |||
342 | +++ app/components/Shadow.qml 2015-12-11 02:20:37 +0000 | |||
343 | @@ -17,7 +17,7 @@ | |||
344 | 17 | */ | 17 | */ |
345 | 18 | 18 | ||
346 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
348 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
349 | 21 | 21 | ||
350 | 22 | Item { | 22 | Item { |
351 | 23 | id: _shadowContainer | 23 | id: _shadowContainer |
352 | 24 | 24 | ||
353 | === modified file 'app/components/SubtitledListItem.qml' | |||
354 | --- app/components/SubtitledListItem.qml 2015-08-14 05:34:49 +0000 | |||
355 | +++ app/components/SubtitledListItem.qml 2015-12-11 02:20:37 +0000 | |||
356 | @@ -17,7 +17,7 @@ | |||
357 | 17 | */ | 17 | */ |
358 | 18 | 18 | ||
359 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
361 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
362 | 21 | 21 | ||
363 | 22 | /* | 22 | /* |
364 | 23 | This component is almost an identical copy of the SDK's subtitled with the | 23 | This component is almost an identical copy of the SDK's subtitled with the |
365 | 24 | 24 | ||
366 | === modified file 'app/stopwatch/LapListView.qml' | |||
367 | --- app/stopwatch/LapListView.qml 2015-09-09 20:26:22 +0000 | |||
368 | +++ app/stopwatch/LapListView.qml 2015-12-11 02:20:37 +0000 | |||
369 | @@ -18,7 +18,7 @@ | |||
370 | 18 | 18 | ||
371 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
372 | 20 | import QtQuick.Layouts 1.1 | 20 | import QtQuick.Layouts 1.1 |
374 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
375 | 22 | import Stopwatch 1.0 | 22 | import Stopwatch 1.0 |
376 | 23 | 23 | ||
377 | 24 | ListView { | 24 | ListView { |
378 | 25 | 25 | ||
379 | === modified file 'app/stopwatch/StopwatchFace.qml' | |||
380 | --- app/stopwatch/StopwatchFace.qml 2015-08-26 22:41:34 +0000 | |||
381 | +++ app/stopwatch/StopwatchFace.qml 2015-12-11 02:20:37 +0000 | |||
382 | @@ -18,7 +18,7 @@ | |||
383 | 18 | 18 | ||
384 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
385 | 20 | import Stopwatch 1.0 | 20 | import Stopwatch 1.0 |
387 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
388 | 22 | import "../components" | 22 | import "../components" |
389 | 23 | 23 | ||
390 | 24 | ClockCircle { | 24 | ClockCircle { |
391 | 25 | 25 | ||
392 | === modified file 'app/stopwatch/StopwatchPage.qml' | |||
393 | --- app/stopwatch/StopwatchPage.qml 2015-09-11 12:08:23 +0000 | |||
394 | +++ app/stopwatch/StopwatchPage.qml 2015-12-11 02:20:37 +0000 | |||
395 | @@ -18,7 +18,7 @@ | |||
396 | 18 | 18 | ||
397 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
398 | 20 | import Stopwatch 1.0 | 20 | import Stopwatch 1.0 |
400 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
401 | 22 | 22 | ||
402 | 23 | Item { | 23 | Item { |
403 | 24 | id: _stopwatchPage | 24 | id: _stopwatchPage |
404 | 25 | 25 | ||
405 | === modified file 'app/ubuntu-clock-app.qml' | |||
406 | --- app/ubuntu-clock-app.qml 2015-10-11 20:10:27 +0000 | |||
407 | +++ app/ubuntu-clock-app.qml 2015-12-11 02:20:37 +0000 | |||
408 | @@ -20,7 +20,7 @@ | |||
409 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
410 | 21 | import U1db 1.0 as U1db | 21 | import U1db 1.0 as U1db |
411 | 22 | import Alarm 1.0 | 22 | import Alarm 1.0 |
413 | 23 | import Ubuntu.Components 1.2 | 23 | import Ubuntu.Components 1.3 |
414 | 24 | import "components" | 24 | import "components" |
415 | 25 | 25 | ||
416 | 26 | MainView { | 26 | MainView { |
417 | 27 | 27 | ||
418 | === modified file 'app/upstreamcomponents/FakeHeader.qml' | |||
419 | --- app/upstreamcomponents/FakeHeader.qml 2015-08-14 05:34:49 +0000 | |||
420 | +++ app/upstreamcomponents/FakeHeader.qml 2015-12-11 02:20:37 +0000 | |||
421 | @@ -17,22 +17,22 @@ | |||
422 | 17 | */ | 17 | */ |
423 | 18 | 18 | ||
424 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
426 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
427 | 21 | 21 | ||
428 | 22 | Column { | 22 | Column { |
429 | 23 | id: fakeHeader | 23 | id: fakeHeader |
430 | 24 | 24 | ||
432 | 25 | height: units.gu(9) | 25 | height: units.gu(6.125) |
433 | 26 | 26 | ||
434 | 27 | Rectangle { | 27 | Rectangle { |
436 | 28 | height: units.gu(7) | 28 | height: units.gu(6) |
437 | 29 | width: parent.width | 29 | width: parent.width |
438 | 30 | color: Theme.palette.normal.background | 30 | color: Theme.palette.normal.background |
439 | 31 | } | 31 | } |
440 | 32 | 32 | ||
441 | 33 | Rectangle { | 33 | Rectangle { |
442 | 34 | color: "#C9C9C9" | 34 | color: "#C9C9C9" |
444 | 35 | height: units.gu(2) | 35 | height: units.gu(0.125) |
445 | 36 | anchors.left: parent.left | 36 | anchors.left: parent.left |
446 | 37 | anchors.right: parent.right | 37 | anchors.right: parent.right |
447 | 38 | } | 38 | } |
448 | 39 | 39 | ||
449 | === modified file 'app/upstreamcomponents/FastScroll.qml' | |||
450 | --- app/upstreamcomponents/FastScroll.qml 2015-08-24 09:56:38 +0000 | |||
451 | +++ app/upstreamcomponents/FastScroll.qml 2015-12-11 02:20:37 +0000 | |||
452 | @@ -41,7 +41,7 @@ | |||
453 | 41 | 41 | ||
454 | 42 | // FastScroll.qml | 42 | // FastScroll.qml |
455 | 43 | import QtQuick 2.4 | 43 | import QtQuick 2.4 |
457 | 44 | import Ubuntu.Components 1.2 | 44 | import Ubuntu.Components 1.3 |
458 | 45 | import "FastScroll.js" as Sections | 45 | import "FastScroll.js" as Sections |
459 | 46 | 46 | ||
460 | 47 | Item { | 47 | Item { |
461 | 48 | 48 | ||
462 | === modified file 'app/upstreamcomponents/PageWithBottomEdge.qml' | |||
463 | --- app/upstreamcomponents/PageWithBottomEdge.qml 2015-05-27 16:03:23 +0000 | |||
464 | +++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-12-11 02:20:37 +0000 | |||
465 | @@ -62,8 +62,8 @@ | |||
466 | 62 | 62 | ||
467 | 63 | */ | 63 | */ |
468 | 64 | 64 | ||
471 | 65 | import QtQuick 2.2 | 65 | import QtQuick 2.4 |
472 | 66 | import Ubuntu.Components 1.2 | 66 | import Ubuntu.Components 1.3 |
473 | 67 | 67 | ||
474 | 68 | Page { | 68 | Page { |
475 | 69 | id: page | 69 | id: page |
476 | @@ -175,7 +175,7 @@ | |||
477 | 175 | z: 1 | 175 | z: 1 |
478 | 176 | width: tipLabel.paintedWidth + units.gu(6) | 176 | width: tipLabel.paintedWidth + units.gu(6) |
479 | 177 | height: bottomEdge.tipHeight + units.gu(1) | 177 | height: bottomEdge.tipHeight + units.gu(1) |
481 | 178 | color: Theme.palette.normal.overlay | 178 | backgroundColor: Theme.palette.normal.overlay |
482 | 179 | Label { | 179 | Label { |
483 | 180 | id: tipLabel | 180 | id: tipLabel |
484 | 181 | 181 | ||
485 | 182 | 182 | ||
486 | === modified file 'app/worldclock/AddWorldCityButton.qml' | |||
487 | --- app/worldclock/AddWorldCityButton.qml 2015-08-20 15:41:34 +0000 | |||
488 | +++ app/worldclock/AddWorldCityButton.qml 2015-12-11 02:20:37 +0000 | |||
489 | @@ -17,7 +17,7 @@ | |||
490 | 17 | */ | 17 | */ |
491 | 18 | 18 | ||
492 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
494 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
495 | 21 | import "../components" | 21 | import "../components" |
496 | 22 | 22 | ||
497 | 23 | AbstractButton { | 23 | AbstractButton { |
498 | 24 | 24 | ||
499 | === modified file 'app/worldclock/UserWorldCityDelegate.qml' | |||
500 | --- app/worldclock/UserWorldCityDelegate.qml 2015-10-08 19:56:37 +0000 | |||
501 | +++ app/worldclock/UserWorldCityDelegate.qml 2015-12-11 02:20:37 +0000 | |||
502 | @@ -17,7 +17,7 @@ | |||
503 | 17 | */ | 17 | */ |
504 | 18 | 18 | ||
505 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
507 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
508 | 21 | import "../components" | 21 | import "../components" |
509 | 22 | 22 | ||
510 | 23 | ListItem { | 23 | ListItem { |
511 | 24 | 24 | ||
512 | === modified file 'app/worldclock/UserWorldCityList.qml' | |||
513 | --- app/worldclock/UserWorldCityList.qml 2015-08-29 01:45:19 +0000 | |||
514 | +++ app/worldclock/UserWorldCityList.qml 2015-12-11 02:20:37 +0000 | |||
515 | @@ -19,7 +19,7 @@ | |||
516 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
517 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
518 | 21 | import U1db 1.0 as U1db | 21 | import U1db 1.0 as U1db |
520 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
521 | 23 | 23 | ||
522 | 24 | ListView { | 24 | ListView { |
523 | 25 | id: worldCityColumn | 25 | id: worldCityColumn |
524 | 26 | 26 | ||
525 | === modified file 'app/worldclock/WorldCityList.qml' | |||
526 | --- app/worldclock/WorldCityList.qml 2015-10-29 22:14:42 +0000 | |||
527 | +++ app/worldclock/WorldCityList.qml 2015-12-11 02:20:37 +0000 | |||
528 | @@ -18,7 +18,7 @@ | |||
529 | 18 | 18 | ||
530 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
531 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
533 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
534 | 22 | import "../components" | 22 | import "../components" |
535 | 23 | import "../upstreamcomponents" | 23 | import "../upstreamcomponents" |
536 | 24 | 24 | ||
537 | 25 | 25 | ||
538 | === modified file 'debian/changelog' | |||
539 | --- debian/changelog 2015-10-27 22:49:37 +0000 | |||
540 | +++ debian/changelog 2015-12-11 02:20:37 +0000 | |||
541 | @@ -2,6 +2,7 @@ | |||
542 | 2 | 2 | ||
543 | 3 | [ Bartosz Kosiorek ] | 3 | [ Bartosz Kosiorek ] |
544 | 4 | * Fix alarm difference time description, during DST change (LP: #1510694) | 4 | * Fix alarm difference time description, during DST change (LP: #1510694) |
545 | 5 | * Move to use the new SDK components v1.3 (LP: #1508363) | ||
546 | 5 | 6 | ||
547 | 6 | -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 27 Oct 2015 23:49:19 +0100 | 7 | -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 27 Oct 2015 23:49:19 +0100 |
548 | 7 | 8 | ||
549 | 8 | 9 | ||
550 | === modified file 'manifest.json.in' | |||
551 | --- manifest.json.in 2015-10-29 22:14:42 +0000 | |||
552 | +++ manifest.json.in 2015-12-11 02:20:37 +0000 | |||
553 | @@ -1,7 +1,7 @@ | |||
554 | 1 | { | 1 | { |
555 | 2 | "name": "com.ubuntu.clock", | 2 | "name": "com.ubuntu.clock", |
556 | 3 | "description": "A sophisticated clock app for Ubuntu Touch", | 3 | "description": "A sophisticated clock app for Ubuntu Touch", |
558 | 4 | "framework": "ubuntu-sdk-15.04", | 4 | "framework": "ubuntu-sdk-15.04.1", |
559 | 5 | "architecture": "@CLICK_ARCH@", | 5 | "architecture": "@CLICK_ARCH@", |
560 | 6 | "title": "Clock", | 6 | "title": "Clock", |
561 | 7 | "icon": "clock@30.png", | 7 | "icon": "clock@30.png", |
562 | 8 | 8 | ||
563 | === modified file 'tests/unit/MockClockApp.qml' | |||
564 | --- tests/unit/MockClockApp.qml 2015-10-06 22:34:27 +0000 | |||
565 | +++ tests/unit/MockClockApp.qml 2015-12-11 02:20:37 +0000 | |||
566 | @@ -19,7 +19,7 @@ | |||
567 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
568 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
569 | 21 | import U1db 1.0 as U1db | 21 | import U1db 1.0 as U1db |
571 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
572 | 23 | import "../../app" | 23 | import "../../app" |
573 | 24 | import "../../app/components" | 24 | import "../../app/components" |
574 | 25 | import "../../app/clock" | 25 | import "../../app/clock" |
575 | 26 | 26 | ||
576 | === modified file 'tests/unit/tst_alarm.qml' | |||
577 | --- tests/unit/tst_alarm.qml 2015-10-27 22:49:37 +0000 | |||
578 | +++ tests/unit/tst_alarm.qml 2015-12-11 02:20:37 +0000 | |||
579 | @@ -18,7 +18,7 @@ | |||
580 | 18 | 18 | ||
581 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
582 | 20 | import WorldClock 1.0 | 20 | import WorldClock 1.0 |
584 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
585 | 22 | import "../../app/alarm" | 22 | import "../../app/alarm" |
586 | 23 | 23 | ||
587 | 24 | MainView { | 24 | MainView { |
588 | 25 | 25 | ||
589 | === modified file 'tests/unit/tst_alarmLabel.qml' | |||
590 | --- tests/unit/tst_alarmLabel.qml 2015-08-12 16:57:29 +0000 | |||
591 | +++ tests/unit/tst_alarmLabel.qml 2015-12-11 02:20:37 +0000 | |||
592 | @@ -17,7 +17,7 @@ | |||
593 | 17 | */ | 17 | */ |
594 | 18 | 18 | ||
595 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
597 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
598 | 21 | import "../../app/alarm" | 21 | import "../../app/alarm" |
599 | 22 | 22 | ||
600 | 23 | MainView { | 23 | MainView { |
601 | 24 | 24 | ||
602 | === modified file 'tests/unit/tst_alarmRepeat.qml' | |||
603 | --- tests/unit/tst_alarmRepeat.qml 2015-08-12 18:50:48 +0000 | |||
604 | +++ tests/unit/tst_alarmRepeat.qml 2015-12-11 02:20:37 +0000 | |||
605 | @@ -19,7 +19,7 @@ | |||
606 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
607 | 20 | import QtTest 1.0 | 20 | import QtTest 1.0 |
608 | 21 | import Ubuntu.Test 1.0 | 21 | import Ubuntu.Test 1.0 |
610 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
611 | 23 | import "../../app/alarm" | 23 | import "../../app/alarm" |
612 | 24 | 24 | ||
613 | 25 | MainView { | 25 | MainView { |
614 | 26 | 26 | ||
615 | === modified file 'tests/unit/tst_alarmSound.qml' | |||
616 | --- tests/unit/tst_alarmSound.qml 2015-08-28 18:50:21 +0000 | |||
617 | +++ tests/unit/tst_alarmSound.qml 2015-12-11 02:20:37 +0000 | |||
618 | @@ -19,7 +19,7 @@ | |||
619 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
620 | 20 | import QtTest 1.0 | 20 | import QtTest 1.0 |
621 | 21 | import Ubuntu.Test 1.0 | 21 | import Ubuntu.Test 1.0 |
623 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
624 | 23 | import Qt.labs.folderlistmodel 2.1 | 23 | import Qt.labs.folderlistmodel 2.1 |
625 | 24 | import "../../app/alarm" | 24 | import "../../app/alarm" |
626 | 25 | 25 | ||
627 | 26 | 26 | ||
628 | === modified file 'tests/unit/tst_alarmUtils.qml' | |||
629 | --- tests/unit/tst_alarmUtils.qml 2015-10-27 22:49:37 +0000 | |||
630 | +++ tests/unit/tst_alarmUtils.qml 2015-12-11 02:20:37 +0000 | |||
631 | @@ -18,7 +18,7 @@ | |||
632 | 18 | 18 | ||
633 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
634 | 20 | import QtTest 1.0 | 20 | import QtTest 1.0 |
636 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
637 | 22 | import "../../app/alarm" | 22 | import "../../app/alarm" |
638 | 23 | 23 | ||
639 | 24 | TestCase { | 24 | TestCase { |
640 | 25 | 25 | ||
641 | === modified file 'tests/unit/tst_stopwatchUtils.qml' | |||
642 | --- tests/unit/tst_stopwatchUtils.qml 2015-08-26 22:50:57 +0000 | |||
643 | +++ tests/unit/tst_stopwatchUtils.qml 2015-12-11 02:20:37 +0000 | |||
644 | @@ -19,7 +19,7 @@ | |||
645 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
646 | 20 | import QtTest 1.0 | 20 | import QtTest 1.0 |
647 | 21 | import Stopwatch 1.0 | 21 | import Stopwatch 1.0 |
649 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
650 | 23 | import "../../app/stopwatch" | 23 | import "../../app/stopwatch" |
651 | 24 | 24 | ||
652 | 25 | TestCase { | 25 | TestCase { |
653 | 26 | 26 | ||
654 | === modified file 'tests/unit/tst_worldClock.qml' | |||
655 | --- tests/unit/tst_worldClock.qml 2015-08-17 13:07:38 +0000 | |||
656 | +++ tests/unit/tst_worldClock.qml 2015-12-11 02:20:37 +0000 | |||
657 | @@ -19,7 +19,7 @@ | |||
658 | 19 | import QtQuick 2.4 | 19 | import QtQuick 2.4 |
659 | 20 | import QtTest 1.0 | 20 | import QtTest 1.0 |
660 | 21 | import Ubuntu.Test 1.0 | 21 | import Ubuntu.Test 1.0 |
662 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
663 | 23 | 23 | ||
664 | 24 | MockClockApp { | 24 | MockClockApp { |
665 | 25 | id: clockApp | 25 | id: clockApp |
PASSED: Continuous integration, rev:402 /core-apps- jenkins. ubuntu. com/job/ clock-app- ci/17/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/111/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ clock-app- ci/17/rebuild
https:/