Merge lp:~nik90/ubuntu-weather-app/added-desktop-file into lp:ubuntu-weather-app/obsolete.trunk

[Nekhelesh Ramananthan]

Added desktop file to allow for testing on device using Qtcreator

Since the CMAKE transition, it is not possible to run the weather app on device using Qtcreator due to a missing desktop file. This has been added until an official fix is provided for by the qtcreator ubuntu plugins. This method is also used by the clock app.

[David Planella (dpm)]

10 +Exec=qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml

To run on the source tree, this should probably be:

Exec=qmlscene ubuntu-weather-app.qml

review: Needs Fixing

[David Planella (dpm)]

LGTM now, thanks!

review: Approve

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/101/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-land-weather-app/4/console
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-autolanding/51

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:234
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/187/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty-weather-app/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/185
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/185
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/99

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/187/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

While we're at it, and since this needs reapproval, could you modify the Exec line again?

10 +Exec=qmlscene ubuntu-weather-app.qml

To be:

Exec=qmlscene -qt5 ubuntu-weather-app.qml

review: Needs Fixing

[lp:~nik90/ubuntu-weather-app/added-desktop-file]

235. By Nekhelesh Ramananthan on 2014-04-16

Added qt5 to exec line

[David Planella (dpm)]

Thanks!

review: Approve

=== added file 'ubuntu-weather-app.desktop'
--- ubuntu-weather-app.desktop	1970-01-01 00:00:00 +0000
+++ ubuntu-weather-app.desktop	2014-04-16 14:42:19 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=qmlscene -qt5 ubuntu-weather-app.qml
+Icon=weather64.png
+Name=Weather
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage