Merge lp:~bzoltan/ubuntu-weather-app/namig-fix into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Zoltan Balogh
Status: Rejected
Rejected by: Martin Borho
Proposed branch: lp:~bzoltan/ubuntu-weather-app/namig-fix
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 14 lines (+2/-1)
1 file modified
weather.qml (+2/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-weather-app/namig-fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Martin Borho Approve
Review via email: mp+153774@code.launchpad.net

Commit message

naming fix

Description of the change

fix desktop file name and add application name property

To post a comment you must log in.
Revision history for this message
Martin Borho (martin-borho) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~bzoltan/ubuntu-weather-app/namig-fix/+merge/153774/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Borho (martin-borho) wrote :

Changes were aleady merged from another branch

Unmerged revisions

5. By Zoltan Balogh

fix desktop file name and add application name property

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'ubuntu-weather-app' => 'weather'
2=== renamed file 'ubuntu-weather-app.desktop' => 'weather.desktop'
3=== modified file 'weather.qml'
4--- weather.qml 2013-03-09 15:34:59 +0000
5+++ weather.qml 2013-03-18 12:27:27 +0000
6@@ -11,7 +11,8 @@
7 MainView {
8 // objectName for functional testing purposes (autopilot-qt5)
9 objectName: "weather"
10-
11+ applicationName: "weather"
12+
13 width: units.gu(50)
14 height: units.gu(75)
15

Subscribers

People subscribed via source and target branches