Merge lp:~martin-borho/ubuntu-weather-app/toolbar-fix into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Martin Borho on 2013-06-17
Status: Merged
Approved by: Michael Hall on 2013-06-17
Approved revision: 43
Merged at revision: 42
Proposed branch: lp:~martin-borho/ubuntu-weather-app/toolbar-fix
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 16 lines (+4/-2)
1 file modified
components/AddLocationPage.qml (+4/-2)
To merge this branch: bzr merge lp:~martin-borho/ubuntu-weather-app/toolbar-fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-06-17
Michael Hall 2013-06-17 Approve on 2013-06-17
Raúl Yeguas Approve on 2013-06-17
Review via email: mp+169814@code.launchpad.net

Commit message

Fix for Bug #1191808

Description of the change

fix for Bug #1191808

No device to test at the moment, SDK on raring says: "ToolbarActions.active property is DEPRECATED. Use opened instead."

To post a comment you must log in.
Michael Hall (mhall119) wrote :

Looks good to me

review: Approve
Michael Hall (mhall119) wrote :

Looks good to me

review: Approve
Michael Hall (mhall119) wrote :

file:///home/mhall/projects/Ubuntu/sdk/pure-qml/ubuntu-weather-app/ubuntu-weather-app.qml:98 Type Components.AddLocationPage unavailable
file:///home/mhall/projects/Ubuntu/sdk/pure-qml/ubuntu-weather-app/components/AddLocationPage.qml:12 Cannot assign to non-existent property "active"

review: Needs Fixing
Raúl Yeguas (neokore) wrote :

Fixed, good work Martin!

review: Approve
review: Needs Fixing (continuous-integration)
Michael Hall (mhall119) wrote :

Works now

review: Approve
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 2013-06-12 16:41:07 +0000
3+++ components/AddLocationPage.qml 2013-06-17 15:25:34 +0000
4@@ -7,8 +7,10 @@
5 objectName: "AddLocationrPage"
6 title: i18n.tr("Add city")
7 visible: false
8- tools.locked: true
9- tools.opened: true
10+ tools: ToolbarActions{
11+ locked: true
12+ opened: true
13+ }
14
15 WorkerScript {
16 id: searchWorker

Subscribers

People subscribed via source and target branches