Merge lp:~mzanetti/qtcreator-plugin-ubuntu/fix-device_run_app-for-mir into lp:qtcreator-plugin-ubuntu

[Michael Zanetti]

make it work on Mir too, no need to hardcode the qpa platform

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/68

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qtcreator-plugin-ubuntu-ci/68/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Doesn't work for me:

18:37:03] bash: Kann die Prozessgruppe des Terminals nicht setzen (-1).: Das Argument ist ungültig
bash: Keine Job-Steuerung in dieser Shell.
[18:37:03] QXcbConnection: Could not connect to display
[18:37:05] bash: [3802: 3 (255)] tcsetattr: Das Argument ist ungültig

(Cannot set process group of terminal: Invalid argument: bash: No job control in this shell: tcsetattr: Invalid argument)

review: Needs Fixing

[Cris Dywan (kalikiana)]

Correcting myself: something went wrong before, I re-downloaded the new file from the branch and and copied it in place, and now Build > Touch > Run on Device works quite fine.

review: Approve

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_run_app'
--- share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-09-27 15:02:28 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-10-11 14:06:44 +0000
@@ -60,7 +60,7 @@
 # get dbus session addrss from the device
 DBUS_SESSION_BUS_ADDRESS=`$SSH "cat ~/.cache/upstart/dbus-session|grep DBUS_SESSION_BUS_ADDRESS"`
 
-COMMAND="export ${DBUS_SESSION_BUS_ADDRESS=}; APP_ID=${APP_ID} qmlscene -platform ubuntu ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}"
+COMMAND="export ${DBUS_SESSION_BUS_ADDRESS=}; APP_ID=${APP_ID} qmlscene ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}"
 
 # make a tar package
 tar -cjf ${FOLDERNAME}.tar.bz2 ${FOLDERNAME}