Merge lp:~martin-borho/ubuntu-weather-app/new-toolbar-items into lp:ubuntu-weather-app/obsolete.trunk
Proposed by
Martin Borho
Status: | Merged |
---|---|
Approved by: | Raúl Yeguas |
Approved revision: | 58 |
Merged at revision: | 55 |
Proposed branch: | lp:~martin-borho/ubuntu-weather-app/new-toolbar-items |
Merge into: | lp:ubuntu-weather-app/obsolete.trunk |
Diff against target: |
292 lines (+96/-69) 8 files modified
components/AddLocationPage.qml (+9/-1) components/LocationManagerPage.qml (+16/-9) components/LocationTab.qml (+38/-27) components/SettingsPage.qml (+20/-14) tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py (+7/-12) tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py (+2/-2) tests/autopilot/ubuntu_weather_app/tests/test_mainview.py (+1/-1) tests/autopilot/ubuntu_weather_app/tests/test_settings.py (+3/-3) |
To merge this branch: | bzr merge lp:~martin-borho/ubuntu-weather-app/new-toolbar-items |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raúl Yeguas | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+173075@code.launchpad.net |
Commit message
Replaced deprecated ToolbarAction with new ToolbarItems with named ToolbarButton components
Description of the change
* Replaced ToolbarAction with new ToolbarItems with named ToolbarButton components.
* Temporary fix in ubuntusdk.py to get autopilot tests work with new ToolbarItems and objectNames, will be replaced when new emulator will land.
To post a comment you must log in.
PASSED: Continuous integration, rev:58 91.189. 93.70:8080/ job/ubuntu- weather- app-ci/ 5/ 91.189. 93.70:8080/ job/ubuntu- weather- app-quantal- amd64-ci/ 5 91.189. 93.70:8080/ job/ubuntu- weather- app-raring- amd64-ci/ 5
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-ci/ 5/rebuild
http://