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

[Zoltan Balogh]

Fix project to work better with the QtCreator

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.125:8080/job/ubuntu-weather-app-autolanding/8/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-autolanding/8/console
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-autolanding/8/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

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

=== modified file 'ubuntu-weather-app.desktop'
--- ubuntu-weather-app.desktop	2013-02-12 16:27:32 +0000
+++ ubuntu-weather-app.desktop	2013-04-18 11:57:28 +0000
@@ -6,3 +6,4 @@
 Exec=/usr/bin/ubuntu-weather-app
 Icon=/usr/share/ubuntu-weather-app/weather64.png
 Name=Weather
+X-Ubuntu-Touch=true
 
=== renamed file 'weather.qml' => 'ubuntu-weather-app.qml'
--- weather.qml	2013-03-28 15:16:05 +0000
+++ ubuntu-weather-app.qml	2013-04-18 11:57:28 +0000
@@ -12,7 +12,7 @@
 MainView {
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "weather"
-    
+    applicationName: "ubuntu-weather-app"
     width: units.gu(50)
     height: units.gu(75)
     
 
=== renamed file 'weather.qmlproject' => 'ubuntu-weather-app.qmlproject'
--- weather.qmlproject	2013-02-12 16:27:32 +0000
+++ ubuntu-weather-app.qmlproject	2013-04-18 11:57:28 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "weather.qml"
+    mainFile: "ubuntu-weather-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {