Merge lp:~bzoltan/ubuntu-calculator-app/namig-fix into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Zoltan Balogh]

File name scheme fixed to make the app launch-able from the QtCreator. Additionally the property for application name is set to hook up the app with the HUD on the phablet.

File name scheme fixed to make the app launch-able from the QtCreator. Additionally the property for application name is set to hook up the app with the HUD on the phablet.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[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-calculator-app/namig-fix/+merge/153751/+edit-commit-message

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'ubuntu-calculator-app'
--- ubuntu-calculator-app	2013-02-12 16:27:14 +0000
+++ ubuntu-calculator-app	2013-03-18 11:01:19 +0000
@@ -1,2 +1,2 @@
 #!/bin/bash
-qmlscene /usr/share/ubuntu-calculator-app/calculator.qml
+qmlscene /usr/share/ubuntu-calculator-app/ubuntu-calculator-app.qml

=== renamed file 'calculator.qml' => 'ubuntu-calculator-app.qml'
--- calculator.qml	2013-03-16 08:17:59 +0000
+++ ubuntu-calculator-app.qml	2013-03-18 11:01:19 +0000
@@ -13,6 +13,7 @@
     id: mainView
     // objectName for functional testing purposes (autopilot-qt5)
     objectName: "calculator"
+    applicationName: "ubuntu-calculator-app"
 
     width: units.gu(50)
     height: units.gu(75)

=== renamed file 'calculator.qmlproject' => 'ubuntu-calculator-app.qmlproject'
--- calculator.qmlproject	2013-02-13 15:36:48 +0000
+++ ubuntu-calculator-app.qmlproject	2013-03-18 11:01:19 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "calculator.qml"
+    mainFile: "ubuntu-calculator-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {