Merge lp:~vthompson/ubuntu-weather-app/reboot-15.04 into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-06-18
Status: Merged
Approved by: Nekhelesh Ramananthan on 2015-06-21
Approved revision: 53
Merged at revision: 53
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-15.04
Merge into: lp:ubuntu-weather-app
Diff against target: 509 lines (+64/-65)
32 files modified
app/components/CurrentLocation.qml (+2/-2)
app/components/DayDelegate.qml (+2/-2)
app/components/ExpandableListItem.qml (+2/-2)
app/components/FastScroll.qml (+3/-3)
app/components/ForecastDetailsDelegate.qml (+2/-2)
app/components/HeaderRow.qml (+2/-2)
app/components/HomeGraphic.qml (+2/-2)
app/components/HomeHourly.qml (+2/-2)
app/components/HomeTempInfo.qml (+2/-2)
app/components/ListItemActions/CheckBox.qml (+3/-3)
app/components/ListItemActions/Remove.qml (+3/-3)
app/components/ListItemReorderComponent.qml (+2/-2)
app/components/ListItemWithActions.qml (+2/-2)
app/components/LoadingIndicator.qml (+2/-2)
app/components/MultiSelectHeadState.qml (+2/-2)
app/components/MultiSelectListView.qml (+2/-2)
app/components/PageWithBottomEdge.qml (+3/-3)
app/components/WeatherListItem.qml (+2/-2)
app/components/WeatherListView.qml (+2/-2)
app/data/Storage.qml (+1/-1)
app/ubuntu-weather-app.qml (+2/-3)
app/ui/AddLocationPage.qml (+2/-2)
app/ui/HomePage.qml (+2/-2)
app/ui/LocationPane.qml (+2/-2)
app/ui/LocationsPage.qml (+2/-2)
app/ui/SettingsPage.qml (+2/-2)
app/ui/settings/DataProviderPage.qml (+2/-2)
app/ui/settings/RefreshIntervalPage.qml (+2/-2)
app/ui/settings/UnitsPage.qml (+2/-2)
manifest.json.in (+1/-1)
po/com.ubuntu.weather.pot (+1/-1)
ubuntu-weather-app.apparmor (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-15.04
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) 2015-06-18 Approve on 2015-06-21
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-18
Review via email: mp+262286@code.launchpad.net

Commit message

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

To post a comment you must log in.
53. By Victor Thompson on 2015-06-18

Updates

Nekhelesh Ramananthan (nik90) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml 2015-06-05 01:02:17 +0000
+++ app/components/CurrentLocation.qml 2015-06-18 01:46:08 +0000
@@ -18,8 +18,8 @@
1818
19import QtLocation 5.319import QtLocation 5.3
20import QtPositioning 5.220import QtPositioning 5.2
21import QtQuick 2.321import QtQuick 2.4
22import Ubuntu.Components 1.122import Ubuntu.Components 1.2
23import "../data/WeatherApi.js" as WeatherApi23import "../data/WeatherApi.js" as WeatherApi
2424
2525
2626
=== modified file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml 2015-04-26 15:52:22 +0000
+++ app/components/DayDelegate.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
2222
23ListItem.Standard {23ListItem.Standard {
2424
=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml 2015-03-20 00:36:07 +0000
+++ app/components/ExpandableListItem.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
2222
23/*23/*
2424
=== modified file 'app/components/FastScroll.qml'
--- app/components/FastScroll.qml 2015-03-06 14:07:45 +0000
+++ app/components/FastScroll.qml 2015-06-18 01:46:08 +0000
@@ -1,7 +1,7 @@
1/****************************************************************************1/****************************************************************************
2**2**
3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4** Copyright (C) 2014 Canonical Ltda4** Copyright (C) 2014, 2015 Canonical Ltda
5** All rights reserved.5** All rights reserved.
6** Contact: Nokia Corporation (qt-info@nokia.com)6** Contact: Nokia Corporation (qt-info@nokia.com)
7**7**
@@ -40,8 +40,8 @@
40****************************************************************************/40****************************************************************************/
4141
42// FastScroll.qml42// FastScroll.qml
43import QtQuick 2.343import QtQuick 2.4
44import Ubuntu.Components 1.144import Ubuntu.Components 1.2
45import "FastScroll.js" as Sections45import "FastScroll.js" as Sections
4646
47Item {47Item {
4848
=== modified file 'app/components/ForecastDetailsDelegate.qml'
--- app/components/ForecastDetailsDelegate.qml 2015-04-06 13:29:47 +0000
+++ app/components/ForecastDetailsDelegate.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
2222
23Row {23Row {
2424
=== modified file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml 2015-04-09 22:22:55 +0000
+++ app/components/HeaderRow.qml 2015-06-18 01:46:08 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import QtQuick.Layouts 1.120import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
2222
23RowLayout {23RowLayout {
24 id: headerRow24 id: headerRow
2525
=== modified file 'app/components/HomeGraphic.qml'
--- app/components/HomeGraphic.qml 2015-04-03 20:20:20 +0000
+++ app/components/HomeGraphic.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Item {22Item {
23 height: units.gu(32)23 height: units.gu(32)
2424
=== modified file 'app/components/HomeHourly.qml'
--- app/components/HomeHourly.qml 2015-04-09 22:28:40 +0000
+++ app/components/HomeHourly.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22ListView {22ListView {
23 id: homeHourly23 id: homeHourly
2424
=== modified file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml 2015-02-03 21:26:09 +0000
+++ app/components/HomeTempInfo.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
2222
23Column {23Column {
2424
=== modified file 'app/components/ListItemActions/CheckBox.qml'
--- app/components/ListItemActions/CheckBox.qml 2015-03-03 18:37:59 +0000
+++ app/components/ListItemActions/CheckBox.qml 2015-06-18 01:46:08 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2012-2014 Canonical, Ltd.2 * Copyright (C) 2012-2014, 2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.2
1919
20CheckBox {20CheckBox {
21 checked: root.selected21 checked: root.selected
2222
=== modified file 'app/components/ListItemActions/Remove.qml'
--- app/components/ListItemActions/Remove.qml 2015-03-03 18:37:59 +0000
+++ app/components/ListItemActions/Remove.qml 2015-06-18 01:46:08 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>2 * Copyright (C) 2014, 2015 Andrew Hayzen <ahayzen@gmail.com>
3 * Daniel Holm <d.holmen@gmail.com>3 * Daniel Holm <d.holmen@gmail.com>
4 * Victor Thompson <victor.thompson@gmail.com>4 * Victor Thompson <victor.thompson@gmail.com>
5 *5 *
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Action {22Action {
23 id: removeAction23 id: removeAction
2424
=== modified file 'app/components/ListItemReorderComponent.qml'
--- app/components/ListItemReorderComponent.qml 2015-03-03 18:37:59 +0000
+++ app/components/ListItemReorderComponent.qml 2015-06-18 01:46:08 +0000
@@ -17,8 +17,8 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */18 */
1919
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
2222
2323
24Item {24Item {
2525
=== modified file 'app/components/ListItemWithActions.qml'
--- app/components/ListItemWithActions.qml 2015-03-03 18:37:59 +0000
+++ app/components/ListItemWithActions.qml 2015-06-18 01:46:08 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.317import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.2
19import Ubuntu.Components.ListItems 1.0 as ListItem19import Ubuntu.Components.ListItems 1.0 as ListItem
2020
2121
2222
=== modified file 'app/components/LoadingIndicator.qml'
--- app/components/LoadingIndicator.qml 2015-04-26 23:55:07 +0000
+++ app/components/LoadingIndicator.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22Rectangle {22Rectangle {
23 id: indicator23 id: indicator
2424
=== modified file 'app/components/MultiSelectHeadState.qml'
--- app/components/MultiSelectHeadState.qml 2015-03-03 18:37:59 +0000
+++ app/components/MultiSelectHeadState.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
2121
22PageHeadState {22PageHeadState {
23 id: selectionState23 id: selectionState
2424
=== modified file 'app/components/MultiSelectListView.qml'
--- app/components/MultiSelectListView.qml 2015-03-03 18:37:59 +0000
+++ app/components/MultiSelectListView.qml 2015-06-18 01:46:08 +0000
@@ -17,8 +17,8 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */18 */
1919
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
2222
2323
24WeatherListView {24WeatherListView {
2525
=== modified file 'app/components/PageWithBottomEdge.qml'
--- app/components/PageWithBottomEdge.qml 2015-02-09 01:26:54 +0000
+++ app/components/PageWithBottomEdge.qml 2015-06-18 01:46:08 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical, Ltd.2 * Copyright (C) 2014, 2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.166import Ubuntu.Components 1.2
6767
68Page {68Page {
69 id: page69 id: page
7070
=== modified file 'app/components/WeatherListItem.qml'
--- app/components/WeatherListItem.qml 2015-03-03 18:37:59 +0000
+++ app/components/WeatherListItem.qml 2015-06-18 01:46:08 +0000
@@ -17,8 +17,8 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */18 */
1919
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import Ubuntu.Components.ListItems 0.1 as ListItem22import Ubuntu.Components.ListItems 0.1 as ListItem
2323
2424
2525
=== modified file 'app/components/WeatherListView.qml'
--- app/components/WeatherListView.qml 2015-03-03 18:37:59 +0000
+++ app/components/WeatherListView.qml 2015-06-18 01:46:08 +0000
@@ -17,8 +17,8 @@
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 */18 */
1919
20import QtQuick 2.320import QtQuick 2.4
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
2222
2323
24ListView {24ListView {
2525
=== modified file 'app/data/Storage.qml'
--- app/data/Storage.qml 2015-05-09 00:47:22 +0000
+++ app/data/Storage.qml 2015-06-18 01:46:08 +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.319import QtQuick 2.4
2020
21Item {21Item {
22 property var db: null22 property var db: null
2323
=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml 2015-06-10 01:47:37 +0000
+++ app/ubuntu-weather-app.qml 2015-06-18 01:46:08 +0000
@@ -16,9 +16,9 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Qt.labs.settings 1.020import Qt.labs.settings 1.0
21import Ubuntu.Components 1.121import Ubuntu.Components 1.2
22import "components"22import "components"
23import "data" as Data23import "data" as Data
24import "data/WeatherApi.js" as WeatherApi24import "data/WeatherApi.js" as WeatherApi
@@ -39,7 +39,6 @@
3939
40 backgroundColor: "#F5F5F5"40 backgroundColor: "#F5F5F5"
4141
42 useDeprecatedToolbar: false
43 anchorToKeyboard: true42 anchorToKeyboard: true
4443
45 signal listItemSwiping(int i)44 signal listItemSwiping(int i)
4645
=== modified file 'app/ui/AddLocationPage.qml'
--- app/ui/AddLocationPage.qml 2015-05-29 02:38:23 +0000
+++ app/ui/AddLocationPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.0 as ListItem
22import Ubuntu.Components.Popups 1.022import Ubuntu.Components.Popups 1.0
23import "../components"23import "../components"
2424
=== modified file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml 2015-06-13 23:12:30 +0000
+++ app/ui/HomePage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import "../components"21import "../components"
2222
2323
2424
=== modified file 'app/ui/LocationPane.qml'
--- app/ui/LocationPane.qml 2015-06-06 17:35:38 +0000
+++ app/ui/LocationPane.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../components"22import "../components"
2323
2424
=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml 2015-06-14 21:17:22 +0000
+++ app/ui/LocationsPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../components"22import "../components"
23import "../components/ListItemActions"23import "../components/ListItemActions"
2424
=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml 2015-03-06 13:38:30 +0000
+++ app/ui/SettingsPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
2222
23Page {23Page {
2424
=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml 2015-05-09 01:16:10 +0000
+++ app/ui/settings/DataProviderPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../../components"22import "../../components"
2323
2424
=== modified file 'app/ui/settings/RefreshIntervalPage.qml'
--- app/ui/settings/RefreshIntervalPage.qml 2015-03-20 00:36:07 +0000
+++ app/ui/settings/RefreshIntervalPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../../components"22import "../../components"
2323
2424
=== modified file 'app/ui/settings/UnitsPage.qml'
--- app/ui/settings/UnitsPage.qml 2015-04-27 00:57:35 +0000
+++ app/ui/settings/UnitsPage.qml 2015-06-18 01:46:08 +0000
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.2
21import Ubuntu.Components.ListItems 0.1 as ListItem21import Ubuntu.Components.ListItems 0.1 as ListItem
22import "../../components"22import "../../components"
2323
2424
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-05-17 23:11:54 +0000
+++ manifest.json.in 2015-06-18 01:46:08 +0000
@@ -1,7 +1,7 @@
1{1{
2 "architecture": "all",2 "architecture": "all",
3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
4 "framework": "ubuntu-sdk-14.10-qml",4 "framework": "ubuntu-sdk-15.04-qml",
5 "hooks": {5 "hooks": {
6 "weather": {6 "weather": {
7 "apparmor": "ubuntu-weather-app.apparmor",7 "apparmor": "ubuntu-weather-app.apparmor",
88
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2015-06-05 23:11:51 +0000
+++ po/com.ubuntu.weather.pot 2015-06-18 01:46:08 +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: 2015-06-05 18:04-0500\n"11"POT-Creation-Date: 2015-06-09 19:05-0500\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"
1515
=== modified file 'ubuntu-weather-app.apparmor'
--- ubuntu-weather-app.apparmor 2015-05-19 03:18:19 +0000
+++ ubuntu-weather-app.apparmor 2015-06-18 01:46:08 +0000
@@ -4,5 +4,5 @@
4 "networking",4 "networking",
5 "sensors"5 "sensors"
6 ], 6 ],
7 "policy_version": 1.27 "policy_version": 1.3
8}8}

Subscribers

People subscribed via source and target branches

to all changes: