Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/up-qtquick-version into lp:ubuntu-clock-app

  1. up-qtquick-version
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 66
Merged at revision: 65
Proposed branch: lp:~nik90/ubuntu-clock-app/up-qtquick-version
Merge into: lp:ubuntu-clock-app
Diff against target: 310 lines (+24/-23)
24 files modified
app/alarm/AlarmDelegate.qml (+1/-1)
app/alarm/AlarmLabel.qml (+1/-1)
app/alarm/AlarmList.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 (+1/-1)
app/clock/ClockPage.qml (+1/-1)
app/clock/MainClock.qml (+1/-1)
app/components/AnalogMode.qml (+1/-1)
app/components/AnalogShadow.qml (+1/-1)
app/components/Clock.qml (+1/-1)
app/components/DigitalMode.qml (+1/-1)
app/components/DigitalShadow.qml (+1/-1)
app/components/PullToAdd.qml (+1/-1)
app/components/Shadow.qml (+1/-1)
app/components/SubtitledListItem.qml (+1/-1)
app/ubuntu-clock-app.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)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/up-qtquick-version
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Clock Developers Pending
Review via email: mp+232004@code.launchpad.net

Commit message

Updated QtQuick imports to 2.3

Description of the change

Updated QtQuick imports to 2.3

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

PASSED: Continuous integration, rev:66
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/248/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/99
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/248

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/248/rebuild

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 2014-08-20 08:22:36 +0000
3+++ app/alarm/AlarmDelegate.qml 2014-08-24 12:55:30 +0000
4@@ -16,7 +16,7 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.0
9+import QtQuick 2.3
10 import Ubuntu.Components 1.1
11 import "../upstreamcomponents"
12
13
14=== modified file 'app/alarm/AlarmLabel.qml'
15--- app/alarm/AlarmLabel.qml 2014-08-19 12:23:28 +0000
16+++ app/alarm/AlarmLabel.qml 2014-08-24 12:55:30 +0000
17@@ -16,7 +16,7 @@
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 */
20
21-import QtQuick 2.0
22+import QtQuick 2.3
23 import Ubuntu.Components 1.1
24
25 Page {
26
27=== modified file 'app/alarm/AlarmList.qml'
28--- app/alarm/AlarmList.qml 2014-08-09 15:27:52 +0000
29+++ app/alarm/AlarmList.qml 2014-08-24 12:55:30 +0000
30@@ -16,7 +16,7 @@
31 * along with this program. If not, see <http://www.gnu.org/licenses/>.
32 */
33
34-import QtQuick 2.0
35+import QtQuick 2.3
36 import Ubuntu.Components 1.1
37 import Ubuntu.Components.ListItems 1.0 as ListItem
38 import "../components"
39
40=== modified file 'app/alarm/AlarmPage.qml'
41--- app/alarm/AlarmPage.qml 2014-08-10 17:11:14 +0000
42+++ app/alarm/AlarmPage.qml 2014-08-24 12:55:30 +0000
43@@ -16,7 +16,7 @@
44 * along with this program. If not, see <http://www.gnu.org/licenses/>.
45 */
46
47-import QtQuick 2.0
48+import QtQuick 2.3
49 import Ubuntu.Components 1.1
50 import "../components/Utils.js" as Utils
51
52
53=== modified file 'app/alarm/AlarmRepeat.qml'
54--- app/alarm/AlarmRepeat.qml 2014-08-14 09:26:57 +0000
55+++ app/alarm/AlarmRepeat.qml 2014-08-24 12:55:30 +0000
56@@ -16,7 +16,7 @@
57 * along with this program. If not, see <http://www.gnu.org/licenses/>.
58 */
59
60-import QtQuick 2.0
61+import QtQuick 2.3
62 import Ubuntu.Components 1.1
63 import Ubuntu.Components.ListItems 1.0 as ListItem
64
65
66=== modified file 'app/alarm/AlarmSettingsPage.qml'
67--- app/alarm/AlarmSettingsPage.qml 2014-08-16 07:40:05 +0000
68+++ app/alarm/AlarmSettingsPage.qml 2014-08-24 12:55:30 +0000
69@@ -16,7 +16,7 @@
70 * along with this program. If not, see <http://www.gnu.org/licenses/>.
71 */
72
73-import QtQuick 2.0
74+import QtQuick 2.3
75 import DateTime 1.0
76 import Alarm.Settings 1.0
77 import Ubuntu.Components 1.1
78
79=== modified file 'app/alarm/AlarmSound.qml'
80--- app/alarm/AlarmSound.qml 2014-08-19 19:11:35 +0000
81+++ app/alarm/AlarmSound.qml 2014-08-24 12:55:30 +0000
82@@ -16,7 +16,7 @@
83 * along with this program. If not, see <http://www.gnu.org/licenses/>.
84 */
85
86-import QtQuick 2.0
87+import QtQuick 2.3
88 import QtMultimedia 5.0
89 import Ubuntu.Components 1.1
90 import Ubuntu.Components.ListItems 1.0 as ListItem
91
92=== modified file 'app/alarm/AlarmUtils.qml'
93--- app/alarm/AlarmUtils.qml 2014-07-17 12:21:45 +0000
94+++ app/alarm/AlarmUtils.qml 2014-08-24 12:55:30 +0000
95@@ -16,7 +16,7 @@
96 * along with this program. If not, see <http://www.gnu.org/licenses/>.
97 */
98
99-import QtQuick 2.0
100+import QtQuick 2.3
101 import Ubuntu.Components 1.1
102
103 /*
104
105=== modified file 'app/alarm/EditAlarmPage.qml'
106--- app/alarm/EditAlarmPage.qml 2014-08-14 21:35:28 +0000
107+++ app/alarm/EditAlarmPage.qml 2014-08-24 12:55:30 +0000
108@@ -16,7 +16,7 @@
109 * along with this program. If not, see <http://www.gnu.org/licenses/>.
110 */
111
112-import QtQuick 2.0
113+import QtQuick 2.3
114 import DateTime 1.0
115 import Ubuntu.Components 1.1
116 import Qt.labs.folderlistmodel 2.1
117
118=== modified file 'app/clock/ClockPage.qml'
119--- app/clock/ClockPage.qml 2014-08-06 20:14:02 +0000
120+++ app/clock/ClockPage.qml 2014-08-24 12:55:30 +0000
121@@ -16,7 +16,7 @@
122 * along with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124
125-import QtQuick 2.0
126+import QtQuick 2.3
127 import U1db 1.0 as U1db
128 import Ubuntu.Components 1.1
129 import "../components"
130
131=== modified file 'app/clock/MainClock.qml'
132--- app/clock/MainClock.qml 2014-07-30 02:06:59 +0000
133+++ app/clock/MainClock.qml 2014-08-24 12:55:30 +0000
134@@ -16,7 +16,7 @@
135 * along with this program. If not, see <http://www.gnu.org/licenses/>.
136 */
137
138-import QtQuick 2.0
139+import QtQuick 2.3
140 import DateTime 1.0
141 import Ubuntu.Components 1.1
142 import "../components"
143
144=== modified file 'app/components/AnalogMode.qml'
145--- app/components/AnalogMode.qml 2014-07-27 23:32:14 +0000
146+++ app/components/AnalogMode.qml 2014-08-24 12:55:30 +0000
147@@ -16,7 +16,7 @@
148 * along with this program. If not, see <http://www.gnu.org/licenses/>.
149 */
150
151-import QtQuick 2.0
152+import QtQuick 2.3
153 import Ubuntu.Components 1.1
154
155 ClockCircle {
156
157=== modified file 'app/components/AnalogShadow.qml'
158--- app/components/AnalogShadow.qml 2014-07-25 13:33:17 +0000
159+++ app/components/AnalogShadow.qml 2014-08-24 12:55:30 +0000
160@@ -16,7 +16,7 @@
161 * along with this program. If not, see <http://www.gnu.org/licenses/>.
162 */
163
164-import QtQuick 2.0
165+import QtQuick 2.3
166 import Ubuntu.Components 1.1
167
168 Flipable {
169
170=== modified file 'app/components/Clock.qml'
171--- app/components/Clock.qml 2014-07-26 09:34:15 +0000
172+++ app/components/Clock.qml 2014-08-24 12:55:30 +0000
173@@ -16,7 +16,7 @@
174 * along with this program. If not, see <http://www.gnu.org/licenses/>.
175 */
176
177-import QtQuick 2.0
178+import QtQuick 2.3
179 import Ubuntu.Components 1.1
180 import "Utils.js" as Utils
181
182
183=== modified file 'app/components/DigitalMode.qml'
184--- app/components/DigitalMode.qml 2014-07-25 12:15:01 +0000
185+++ app/components/DigitalMode.qml 2014-08-24 12:55:30 +0000
186@@ -16,7 +16,7 @@
187 * along with this program. If not, see <http://www.gnu.org/licenses/>.
188 */
189
190-import QtQuick 2.0
191+import QtQuick 2.3
192 import Ubuntu.Components 1.1
193
194 ClockCircle {
195
196=== modified file 'app/components/DigitalShadow.qml'
197--- app/components/DigitalShadow.qml 2014-07-25 13:33:17 +0000
198+++ app/components/DigitalShadow.qml 2014-08-24 12:55:30 +0000
199@@ -16,7 +16,7 @@
200 * along with this program. If not, see <http://www.gnu.org/licenses/>.
201 */
202
203-import QtQuick 2.0
204+import QtQuick 2.3
205 import Ubuntu.Components 1.1
206
207 Flipable {
208
209=== modified file 'app/components/PullToAdd.qml'
210--- app/components/PullToAdd.qml 2014-07-17 12:21:45 +0000
211+++ app/components/PullToAdd.qml 2014-08-24 12:55:30 +0000
212@@ -16,7 +16,7 @@
213 * along with this program. If not, see <http://www.gnu.org/licenses/>.
214 */
215
216-import QtQuick 2.0
217+import QtQuick 2.3
218 import Ubuntu.Components 1.1
219
220 Row {
221
222=== modified file 'app/components/Shadow.qml'
223--- app/components/Shadow.qml 2014-07-23 23:42:02 +0000
224+++ app/components/Shadow.qml 2014-08-24 12:55:30 +0000
225@@ -16,7 +16,7 @@
226 * along with this program. If not, see <http://www.gnu.org/licenses/>.
227 */
228
229-import QtQuick 2.0
230+import QtQuick 2.3
231 import Ubuntu.Components 1.1
232
233 Item {
234
235=== modified file 'app/components/SubtitledListItem.qml'
236--- app/components/SubtitledListItem.qml 2014-07-17 12:21:45 +0000
237+++ app/components/SubtitledListItem.qml 2014-08-24 12:55:30 +0000
238@@ -16,7 +16,7 @@
239 * along with this program. If not, see <http://www.gnu.org/licenses/>.
240 */
241
242-import QtQuick 2.0
243+import QtQuick 2.3
244 import Ubuntu.Components 1.1
245 import Ubuntu.Components.ListItems 1.0 as ListItem
246
247
248=== modified file 'app/ubuntu-clock-app.qml'
249--- app/ubuntu-clock-app.qml 2014-08-20 19:26:28 +0000
250+++ app/ubuntu-clock-app.qml 2014-08-24 12:55:30 +0000
251@@ -16,7 +16,7 @@
252 * along with this program. If not, see <http://www.gnu.org/licenses/>.
253 */
254
255-import QtQuick 2.0
256+import QtQuick 2.3
257 import U1db 1.0 as U1db
258 import Ubuntu.Components 1.1
259 import "clock"
260
261=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
262--- app/worldclock/UserWorldCityDelegate.qml 2014-08-16 09:27:30 +0000
263+++ app/worldclock/UserWorldCityDelegate.qml 2014-08-24 12:55:30 +0000
264@@ -16,7 +16,7 @@
265 * along with this program. If not, see <http://www.gnu.org/licenses/>.
266 */
267
268-import QtQuick 2.0
269+import QtQuick 2.3
270 import Ubuntu.Components 1.1
271 import "../components"
272 import "../upstreamcomponents"
273
274=== modified file 'app/worldclock/UserWorldCityList.qml'
275--- app/worldclock/UserWorldCityList.qml 2014-08-09 14:38:15 +0000
276+++ app/worldclock/UserWorldCityList.qml 2014-08-24 12:55:30 +0000
277@@ -16,7 +16,7 @@
278 * along with this program. If not, see <http://www.gnu.org/licenses/>.
279 */
280
281-import QtQuick 2.0
282+import QtQuick 2.3
283 import Timezone 1.0
284 import U1db 1.0 as U1db
285 import Ubuntu.Components 1.1
286
287=== modified file 'app/worldclock/WorldCityList.qml'
288--- app/worldclock/WorldCityList.qml 2014-08-18 14:16:12 +0000
289+++ app/worldclock/WorldCityList.qml 2014-08-24 12:55:30 +0000
290@@ -16,7 +16,7 @@
291 * along with this program. If not, see <http://www.gnu.org/licenses/>.
292 */
293
294-import QtQuick 2.0
295+import QtQuick 2.3
296 import Timezone 1.0
297 import Ubuntu.Components 1.1
298 import Ubuntu.Components.ListItems 1.0 as ListItem
299
300=== modified file 'debian/changelog'
301--- debian/changelog 2014-08-20 22:56:51 +0000
302+++ debian/changelog 2014-08-24 12:55:30 +0000
303@@ -14,6 +14,7 @@
304 sound page. (LP: #1355410)
305 * Changed project name and neccessary support variables from com.ubuntu.devel
306 to com.ubuntu.clock in the CMakeList.txt, manifest.json and autopilot files.
307+ * Updated QtQuick library imports to v2.3
308
309 [Zsombor Egri]
310 * Fixed alarm status toggle being reverted immediately (LP: #1272337)

Subscribers

People subscribed via source and target branches