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

Proposed by Zoltan Balogh on 2013-04-18
Status: Rejected
Rejected by: David Planella on 2013-04-24
Proposed branch: lp:~bzoltan/ubuntu-weather-app/fix-for-qtc
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 34 lines (+3/-2)
3 files modified
ubuntu-weather-app.desktop (+1/-0)
ubuntu-weather-app.qml (+1/-1)
ubuntu-weather-app.qmlproject (+1/-1)
To merge this branch: bzr merge lp:~bzoltan/ubuntu-weather-app/fix-for-qtc
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing on 2013-04-24
Michael Hall 2013-04-18 Pending
Review via email: mp+159608@code.launchpad.net

Commit message

Fix project to work better with the QtCreator

Description of the change

Fix project to work better with the QtCreator:
1. added applicationName: "ubuntu-weather-app" to the MainView
2. renamed the main QML to ubuntu-weather-app.qml
3. renamed the QML project file to ubuntu-weather-app.qmlproject

To post a comment you must log in.

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/fix-for-qtc/+merge/159608/+edit-commit-message

review: Needs Fixing (continuous-integration)
David Planella (dpm) wrote :

All the changes except for one are now in trunk. Zoltan submitted the final change as a separate branch on: https://code.launchpad.net/~bzoltan/ubuntu-weather-app/fix_project_name/+merge/160663

Unmerged revisions

7. By Zoltan Balogh on 2013-04-18

fix project to work better with the QtCreator

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-weather-app.desktop'
2--- ubuntu-weather-app.desktop 2013-02-12 16:27:32 +0000
3+++ ubuntu-weather-app.desktop 2013-04-18 11:57:28 +0000
4@@ -6,3 +6,4 @@
5 Exec=/usr/bin/ubuntu-weather-app
6 Icon=/usr/share/ubuntu-weather-app/weather64.png
7 Name=Weather
8+X-Ubuntu-Touch=true
9
10=== renamed file 'weather.qml' => 'ubuntu-weather-app.qml'
11--- weather.qml 2013-03-28 15:16:05 +0000
12+++ ubuntu-weather-app.qml 2013-04-18 11:57:28 +0000
13@@ -12,7 +12,7 @@
14 MainView {
15 // objectName for functional testing purposes (autopilot-qt5)
16 objectName: "weather"
17-
18+ applicationName: "ubuntu-weather-app"
19 width: units.gu(50)
20 height: units.gu(75)
21
22
23=== renamed file 'weather.qmlproject' => 'ubuntu-weather-app.qmlproject'
24--- weather.qmlproject 2013-02-12 16:27:32 +0000
25+++ ubuntu-weather-app.qmlproject 2013-04-18 11:57:28 +0000
26@@ -3,7 +3,7 @@
27 import QmlProject 1.1
28
29 Project {
30- mainFile: "weather.qml"
31+ mainFile: "ubuntu-weather-app.qml"
32
33 /* Include .qml, .js, and image files from current directory and subdirectories */
34 QmlFiles {

Subscribers

People subscribed via source and target branches