Ubuntu Weather App

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

  1. update-imports-to-qtquick-2.3
  2. Merge into 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
=== modified file 'components/AddLocationPage.qml'
--- components/AddLocationPage.qml 2014-09-04 17:20:53 +0000
+++ components/AddLocationPage.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
19 */19 */
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
2424
=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml 2014-09-02 07:21:28 +0000
+++ components/CurrentWeather.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.Layouts 1.021import Ubuntu.Layouts 1.0
22import "./" as Components22import "./" as Components
2323
=== modified file 'components/CurrentWeatherDetail.qml'
--- components/CurrentWeatherDetail.qml 2014-09-02 07:21:28 +0000
+++ components/CurrentWeatherDetail.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.Layouts 1.021import Ubuntu.Layouts 1.0
22import "./" as Components22import "./" as Components
2323
=== modified file 'components/CurrentWeatherFront.qml'
--- components/CurrentWeatherFront.qml 2014-09-02 07:21:28 +0000
+++ components/CurrentWeatherFront.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.Layouts 1.021import Ubuntu.Layouts 1.0
22import "./" as Components22import "./" as Components
2323
=== modified file 'components/DateComponent.qml'
--- components/DateComponent.qml 2014-09-02 07:21:28 +0000
+++ components/DateComponent.qml 2014-09-20 10:56:10 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 * Authored by: Martin Borho <martin@borho.net>16 * Authored by: Martin Borho <martin@borho.net>
17 */17 */
18import QtQuick 2.018import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
2020
21Rectangle {21Rectangle {
2222
=== modified file 'components/LastUpdatedComponent.qml'
--- components/LastUpdatedComponent.qml 2014-09-02 07:21:28 +0000
+++ components/LastUpdatedComponent.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Martin Borho <martin@borho.net>16 * Authored by: Martin Borho <martin@borho.net>
17 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>17 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
2121
22Rectangle {22Rectangle {
2323
=== modified file 'components/LoadingComponent.qml'
--- components/LoadingComponent.qml 2014-09-02 07:21:28 +0000
+++ components/LoadingComponent.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
2222
23Rectangle {23Rectangle {
2424
=== modified file 'components/LoadingSpinnerComponent.qml'
--- components/LoadingSpinnerComponent.qml 2014-09-02 07:21:28 +0000
+++ components/LoadingSpinnerComponent.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
19 */19 */
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
2222
23UbuntuShape {23UbuntuShape {
2424
=== modified file 'components/LocationManagerPage.qml'
--- components/LocationManagerPage.qml 2014-09-05 09:57:29 +0000
+++ components/LocationManagerPage.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 Raúl Yeguas <neokore@gmail.com>17 Raúl Yeguas <neokore@gmail.com>
18 Riccardo Padovani <ricki.padovani@gmail.com>18 Riccardo Padovani <ricki.padovani@gmail.com>
19 */19 */
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import Ubuntu.Components.ListItems 1.0 as ListItem23import Ubuntu.Components.ListItems 1.0 as ListItem
2424
=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml 2014-09-12 10:19:35 +0000
+++ components/LocationTab.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import Ubuntu.Components.ListItems 1.0 as ListItem22import Ubuntu.Components.ListItems 1.0 as ListItem
2323
=== modified file 'components/ScrollingArea.qml'
--- components/ScrollingArea.qml 2014-06-26 10:49:39 +0000
+++ components/ScrollingArea.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.3
2121
22MouseArea {22MouseArea {
23 id: flippedarea23 id: flippedarea
2424
=== modified file 'components/SettingsPage.qml'
--- components/SettingsPage.qml 2014-08-29 12:23:58 +0000
+++ components/SettingsPage.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
19import QtQuick 2.019import QtQuick 2.3
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
2121
22Page {22Page {
2323
=== modified file 'components/SplashComponent.qml'
--- components/SplashComponent.qml 2014-09-02 07:21:28 +0000
+++ components/SplashComponent.qml 2014-09-20 10:56:10 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 * Authored by: Martin Borho <martin@borho.net>16 * Authored by: Martin Borho <martin@borho.net>
17 */17 */
18import QtQuick 2.018import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
2020
21UbuntuShape {21UbuntuShape {
2222
=== modified file 'components/Storage.qml'
--- components/Storage.qml 2013-10-07 17:40:26 +0000
+++ components/Storage.qml 2014-09-20 10:56:10 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Martin Borho <martin@borho.net>16 * Authored by: Martin Borho <martin@borho.net>
17 */17 */
18import QtQuick.LocalStorage 2.018import QtQuick.LocalStorage 2.0
19import QtQuick 2.019import QtQuick 2.3
2020
21Item {21Item {
22 property var db: null22 property var db: null
2323
=== modified file 'components/TabFooter.qml'
--- components/TabFooter.qml 2014-09-02 07:21:28 +0000
+++ components/TabFooter.qml 2014-09-20 10:56:10 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 * Authored by: Martin Borho <martin@borho.net>16 * Authored by: Martin Borho <martin@borho.net>
17 */17 */
18import QtQuick 2.018import QtQuick 2.3
19import Ubuntu.Components 1.119import Ubuntu.Components 1.1
2020
21Rectangle {21Rectangle {
2222
=== modified file 'components/WeatherConditionIconComponent.qml'
--- components/WeatherConditionIconComponent.qml 2014-09-02 07:21:28 +0000
+++ components/WeatherConditionIconComponent.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 */18 */
1919
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import "./" as Components22import "./" as Components
2323
2424
=== modified file 'components/WeatherDetailComponent.qml'
--- components/WeatherDetailComponent.qml 2014-09-02 07:21:28 +0000
+++ components/WeatherDetailComponent.qml 2014-09-20 10:56:10 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 */17 */
18import QtQuick 2.018import QtQuick 2.3
19import QtGraphicalEffects 1.019import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
2121
2222
=== modified file 'components/WeatherTemperatureComponent.qml'
--- components/WeatherTemperatureComponent.qml 2014-09-09 12:44:00 +0000
+++ components/WeatherTemperatureComponent.qml 2014-09-20 10:56:10 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 * Authored by: Raúl Yeguas <neokore@gmail.com>16 * Authored by: Raúl Yeguas <neokore@gmail.com>
17 */17 */
18import QtQuick 2.018import QtQuick 2.3
19import QtGraphicalEffects 1.019import QtGraphicalEffects 1.0
20import Ubuntu.Components 1.120import Ubuntu.Components 1.1
21import Ubuntu.Layouts 1.021import Ubuntu.Layouts 1.0
2222
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2014-09-12 10:19:35 +0000
+++ po/com.ubuntu.weather.pot 2014-09-20 10:56:10 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-weather-app\n"9"Project-Id-Version: ubuntu-weather-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-09 14:41+0200\n"11"POT-Creation-Date: 2014-09-20 02:38-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -140,7 +140,7 @@
140msgid "Add"140msgid "Add"
141msgstr ""141msgstr ""
142142
143#: ../components/LocationManagerPage.qml:289143#: ../components/LocationManagerPage.qml:289 ../components/LocationTab.qml:147
144msgid "Locations"144msgid "Locations"
145msgstr ""145msgstr ""
146146
@@ -156,10 +156,6 @@
156msgid "Refresh"156msgid "Refresh"
157msgstr ""157msgstr ""
158158
159#: ../components/LocationTab.qml:147
160msgid "Edit"
161msgstr ""
162
163#: ../components/LocationTab.qml:157 ../components/SettingsPage.qml:23159#: ../components/LocationTab.qml:157 ../components/SettingsPage.qml:23
164msgid "Settings"160msgid "Settings"
165msgstr ""161msgstr ""
166162
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml 2014-09-05 10:00:26 +0000
+++ ubuntu-weather-app.qml 2014-09-20 10:56:10 +0000
@@ -17,7 +17,7 @@
17 * Martin Borho <martin@borho.net>17 * Martin Borho <martin@borho.net>
18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>18 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
19 */19 */
20import QtQuick 2.020import QtQuick 2.3
21import Ubuntu.Components 1.121import Ubuntu.Components 1.1
22import "components" as Components22import "components" as Components
23import "components/GradientsMap.js" as Gradients23import "components/GradientsMap.js" as Gradients
@@ -180,7 +180,7 @@
180 if(tabsObject !== null) {180 if(tabsObject !== null) {
181 tabsObject.destroy()181 tabsObject.destroy()
182 }182 }
183 var tabsString = "import QtQuick 2.0; import Ubuntu.Components 1.1; import Ubuntu.Components.Popups 1.0; import \"components\" as Components; "183 var tabsString = "import QtQuick 2.3; import Ubuntu.Components 1.1; import Ubuntu.Components.Popups 1.0; import \"components\" as Components; "
184 + "Tabs {id: tabs; objectName: 'rootTabs'; anchors.fill: parent;"184 + "Tabs {id: tabs; objectName: 'rootTabs'; anchors.fill: parent;"
185 if(locLength > 0) {185 if(locLength > 0) {
186 for(var x=0;x<locLength;x++) {186 for(var x=0;x<locLength;x++) {

Subscribers

People subscribed via source and target branches