Merge lp:~kill-animals/ubuntu-weather-app/update-imports-to-qtquick-2.3 into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Kill Animals
Status: Merged
Approved by: David Planella
Approved revision: 370
Merged at revision: 370
Proposed branch: lp:~kill-animals/ubuntu-weather-app/update-imports-to-qtquick-2.3
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 288 lines (+22/-26)
20 files modified
components/AddLocationPage.qml (+1/-1)
components/CurrentWeather.qml (+1/-1)
components/CurrentWeatherDetail.qml (+1/-1)
components/CurrentWeatherFront.qml (+1/-1)
components/DateComponent.qml (+1/-1)
components/LastUpdatedComponent.qml (+1/-1)
components/LoadingComponent.qml (+1/-1)
components/LoadingSpinnerComponent.qml (+1/-1)
components/LocationManagerPage.qml (+1/-1)
components/LocationTab.qml (+1/-1)
components/ScrollingArea.qml (+1/-1)
components/SettingsPage.qml (+1/-1)
components/SplashComponent.qml (+1/-1)
components/Storage.qml (+1/-1)
components/TabFooter.qml (+1/-1)
components/WeatherConditionIconComponent.qml (+1/-1)
components/WeatherDetailComponent.qml (+1/-1)
components/WeatherTemperatureComponent.qml (+1/-1)
po/com.ubuntu.weather.pot (+2/-6)
ubuntu-weather-app.qml (+2/-2)
To merge this branch: bzr merge lp:~kill-animals/ubuntu-weather-app/update-imports-to-qtquick-2.3
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Martin Borho Approve
Review via email: mp+235372@code.launchpad.net

Commit message

Updated library imports to qtquick-2.3

Description of the change

Updated library imports to qtquick-2.3

To post a comment you must log in.
Revision history for this message
Martin Borho (martin-borho) wrote :

Looks good to me, thanks a lot!

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

FAILED: Continuous integration, rev:370
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~akiva/ubuntu-weather-app/update-imports-to-qtquick-2.3/+merge/235372/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-weather-app-ci/269/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app-python3/7
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app-python3/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/75

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

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

LGTM too, top-approving as per Martin's approval and to get Jenkins running again.

review: Approve
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 'components/AddLocationPage.qml'
2--- components/AddLocationPage.qml 2014-09-04 17:20:53 +0000
3+++ components/AddLocationPage.qml 2014-09-20 10:56:10 +0000
4@@ -17,7 +17,7 @@
5 * Martin Borho <martin@borho.net>
6 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
7 */
8-import QtQuick 2.0
9+import QtQuick 2.3
10 import Ubuntu.Components 1.1
11 import Ubuntu.Components.Popups 1.0
12 import Ubuntu.Components.ListItems 1.0 as ListItem
13
14=== modified file 'components/CurrentWeather.qml'
15--- components/CurrentWeather.qml 2014-09-02 07:21:28 +0000
16+++ components/CurrentWeather.qml 2014-09-20 10:56:10 +0000
17@@ -16,7 +16,7 @@
18 * Authored by: Raúl Yeguas <neokore@gmail.com>
19 * Martin Borho <martin@borho.net>
20 */
21-import QtQuick 2.0
22+import QtQuick 2.3
23 import Ubuntu.Components 1.1
24 import Ubuntu.Layouts 1.0
25 import "./" as Components
26
27=== modified file 'components/CurrentWeatherDetail.qml'
28--- components/CurrentWeatherDetail.qml 2014-09-02 07:21:28 +0000
29+++ components/CurrentWeatherDetail.qml 2014-09-20 10:56:10 +0000
30@@ -16,7 +16,7 @@
31 * Authored by: Raúl Yeguas <neokore@gmail.com>
32 * Martin Borho <martin@borho.net>
33 */
34-import QtQuick 2.0
35+import QtQuick 2.3
36 import Ubuntu.Components 1.1
37 import Ubuntu.Layouts 1.0
38 import "./" as Components
39
40=== modified file 'components/CurrentWeatherFront.qml'
41--- components/CurrentWeatherFront.qml 2014-09-02 07:21:28 +0000
42+++ components/CurrentWeatherFront.qml 2014-09-20 10:56:10 +0000
43@@ -16,7 +16,7 @@
44 * Authored by: Raúl Yeguas <neokore@gmail.com>
45 * Martin Borho <martin@borho.net>
46 */
47-import QtQuick 2.0
48+import QtQuick 2.3
49 import Ubuntu.Components 1.1
50 import Ubuntu.Layouts 1.0
51 import "./" as Components
52
53=== modified file 'components/DateComponent.qml'
54--- components/DateComponent.qml 2014-09-02 07:21:28 +0000
55+++ components/DateComponent.qml 2014-09-20 10:56:10 +0000
56@@ -15,7 +15,7 @@
57 *
58 * Authored by: Martin Borho <martin@borho.net>
59 */
60-import QtQuick 2.0
61+import QtQuick 2.3
62 import Ubuntu.Components 1.1
63
64 Rectangle {
65
66=== modified file 'components/LastUpdatedComponent.qml'
67--- components/LastUpdatedComponent.qml 2014-09-02 07:21:28 +0000
68+++ components/LastUpdatedComponent.qml 2014-09-20 10:56:10 +0000
69@@ -16,7 +16,7 @@
70 * Authored by: Martin Borho <martin@borho.net>
71 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
72 */
73-import QtQuick 2.0
74+import QtQuick 2.3
75 import Ubuntu.Components 1.1
76
77 Rectangle {
78
79=== modified file 'components/LoadingComponent.qml'
80--- components/LoadingComponent.qml 2014-09-02 07:21:28 +0000
81+++ components/LoadingComponent.qml 2014-09-20 10:56:10 +0000
82@@ -17,7 +17,7 @@
83 * Martin Borho <martin@borho.net>
84 */
85
86-import QtQuick 2.0
87+import QtQuick 2.3
88 import Ubuntu.Components 1.1
89
90 Rectangle {
91
92=== modified file 'components/LoadingSpinnerComponent.qml'
93--- components/LoadingSpinnerComponent.qml 2014-09-02 07:21:28 +0000
94+++ components/LoadingSpinnerComponent.qml 2014-09-20 10:56:10 +0000
95@@ -17,7 +17,7 @@
96 * Martin Borho <martin@borho.net>
97 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
98 */
99-import QtQuick 2.0
100+import QtQuick 2.3
101 import Ubuntu.Components 1.1
102
103 UbuntuShape {
104
105=== modified file 'components/LocationManagerPage.qml'
106--- components/LocationManagerPage.qml 2014-09-05 09:57:29 +0000
107+++ components/LocationManagerPage.qml 2014-09-20 10:56:10 +0000
108@@ -17,7 +17,7 @@
109 Raúl Yeguas <neokore@gmail.com>
110 Riccardo Padovani <ricki.padovani@gmail.com>
111 */
112-import QtQuick 2.0
113+import QtQuick 2.3
114 import Ubuntu.Components 1.1
115 import Ubuntu.Components.Popups 1.0
116 import Ubuntu.Components.ListItems 1.0 as ListItem
117
118=== modified file 'components/LocationTab.qml'
119--- components/LocationTab.qml 2014-09-12 10:19:35 +0000
120+++ components/LocationTab.qml 2014-09-20 10:56:10 +0000
121@@ -16,7 +16,7 @@
122 * Authored by: Raúl Yeguas <neokore@gmail.com>
123 * Martin Borho <martin@borho.net>
124 */
125-import QtQuick 2.0
126+import QtQuick 2.3
127 import Ubuntu.Components.Popups 1.0
128 import Ubuntu.Components 1.1
129 import Ubuntu.Components.ListItems 1.0 as ListItem
130
131=== modified file 'components/ScrollingArea.qml'
132--- components/ScrollingArea.qml 2014-06-26 10:49:39 +0000
133+++ components/ScrollingArea.qml 2014-09-20 10:56:10 +0000
134@@ -17,7 +17,7 @@
135 * Martin Borho <martin@borho.net>
136 */
137
138-import QtQuick 2.0
139+import QtQuick 2.3
140
141 MouseArea {
142 id: flippedarea
143
144=== modified file 'components/SettingsPage.qml'
145--- components/SettingsPage.qml 2014-08-29 12:23:58 +0000
146+++ components/SettingsPage.qml 2014-09-20 10:56:10 +0000
147@@ -16,7 +16,7 @@
148 * Authored by: Raúl Yeguas <neokore@gmail.com>
149 * Martin Borho <martin@borho.net>
150 */
151-import QtQuick 2.0
152+import QtQuick 2.3
153 import Ubuntu.Components 1.1
154
155 Page {
156
157=== modified file 'components/SplashComponent.qml'
158--- components/SplashComponent.qml 2014-09-02 07:21:28 +0000
159+++ components/SplashComponent.qml 2014-09-20 10:56:10 +0000
160@@ -15,7 +15,7 @@
161 *
162 * Authored by: Martin Borho <martin@borho.net>
163 */
164-import QtQuick 2.0
165+import QtQuick 2.3
166 import Ubuntu.Components 1.1
167
168 UbuntuShape {
169
170=== modified file 'components/Storage.qml'
171--- components/Storage.qml 2013-10-07 17:40:26 +0000
172+++ components/Storage.qml 2014-09-20 10:56:10 +0000
173@@ -16,7 +16,7 @@
174 * Authored by: Martin Borho <martin@borho.net>
175 */
176 import QtQuick.LocalStorage 2.0
177-import QtQuick 2.0
178+import QtQuick 2.3
179
180 Item {
181 property var db: null
182
183=== modified file 'components/TabFooter.qml'
184--- components/TabFooter.qml 2014-09-02 07:21:28 +0000
185+++ components/TabFooter.qml 2014-09-20 10:56:10 +0000
186@@ -15,7 +15,7 @@
187 *
188 * Authored by: Martin Borho <martin@borho.net>
189 */
190-import QtQuick 2.0
191+import QtQuick 2.3
192 import Ubuntu.Components 1.1
193
194 Rectangle {
195
196=== modified file 'components/WeatherConditionIconComponent.qml'
197--- components/WeatherConditionIconComponent.qml 2014-09-02 07:21:28 +0000
198+++ components/WeatherConditionIconComponent.qml 2014-09-20 10:56:10 +0000
199@@ -17,7 +17,7 @@
200 * Martin Borho <martin@borho.net>
201 */
202
203-import QtQuick 2.0
204+import QtQuick 2.3
205 import Ubuntu.Components 1.1
206 import "./" as Components
207
208
209=== modified file 'components/WeatherDetailComponent.qml'
210--- components/WeatherDetailComponent.qml 2014-09-02 07:21:28 +0000
211+++ components/WeatherDetailComponent.qml 2014-09-20 10:56:10 +0000
212@@ -15,7 +15,7 @@
213 *
214 * Authored by: Raúl Yeguas <neokore@gmail.com>
215 */
216-import QtQuick 2.0
217+import QtQuick 2.3
218 import QtGraphicalEffects 1.0
219 import Ubuntu.Components 1.1
220
221
222=== modified file 'components/WeatherTemperatureComponent.qml'
223--- components/WeatherTemperatureComponent.qml 2014-09-09 12:44:00 +0000
224+++ components/WeatherTemperatureComponent.qml 2014-09-20 10:56:10 +0000
225@@ -15,7 +15,7 @@
226 *
227 * Authored by: Raúl Yeguas <neokore@gmail.com>
228 */
229-import QtQuick 2.0
230+import QtQuick 2.3
231 import QtGraphicalEffects 1.0
232 import Ubuntu.Components 1.1
233 import Ubuntu.Layouts 1.0
234
235=== modified file 'po/com.ubuntu.weather.pot'
236--- po/com.ubuntu.weather.pot 2014-09-12 10:19:35 +0000
237+++ po/com.ubuntu.weather.pot 2014-09-20 10:56:10 +0000
238@@ -8,7 +8,7 @@
239 msgstr ""
240 "Project-Id-Version: ubuntu-weather-app\n"
241 "Report-Msgid-Bugs-To: \n"
242-"POT-Creation-Date: 2014-09-09 14:41+0200\n"
243+"POT-Creation-Date: 2014-09-20 02:38-0700\n"
244 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
245 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
246 "Language-Team: LANGUAGE <LL@li.org>\n"
247@@ -140,7 +140,7 @@
248 msgid "Add"
249 msgstr ""
250
251-#: ../components/LocationManagerPage.qml:289
252+#: ../components/LocationManagerPage.qml:289 ../components/LocationTab.qml:147
253 msgid "Locations"
254 msgstr ""
255
256@@ -156,10 +156,6 @@
257 msgid "Refresh"
258 msgstr ""
259
260-#: ../components/LocationTab.qml:147
261-msgid "Edit"
262-msgstr ""
263-
264 #: ../components/LocationTab.qml:157 ../components/SettingsPage.qml:23
265 msgid "Settings"
266 msgstr ""
267
268=== modified file 'ubuntu-weather-app.qml'
269--- ubuntu-weather-app.qml 2014-09-05 10:00:26 +0000
270+++ ubuntu-weather-app.qml 2014-09-20 10:56:10 +0000
271@@ -17,7 +17,7 @@
272 * Martin Borho <martin@borho.net>
273 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
274 */
275-import QtQuick 2.0
276+import QtQuick 2.3
277 import Ubuntu.Components 1.1
278 import "components" as Components
279 import "components/GradientsMap.js" as Gradients
280@@ -180,7 +180,7 @@
281 if(tabsObject !== null) {
282 tabsObject.destroy()
283 }
284- var tabsString = "import QtQuick 2.0; import Ubuntu.Components 1.1; import Ubuntu.Components.Popups 1.0; import \"components\" as Components; "
285+ var tabsString = "import QtQuick 2.3; import Ubuntu.Components 1.1; import Ubuntu.Components.Popups 1.0; import \"components\" as Components; "
286 + "Tabs {id: tabs; objectName: 'rootTabs'; anchors.fill: parent;"
287 if(locLength > 0) {
288 for(var x=0;x<locLength;x++) {

Subscribers

People subscribed via source and target branches