Merge lp:~dbarth/qtcreator-plugin-ubuntu/fix-1311692 into lp:qtcreator-plugin-ubuntu

[David Barth]

This re-enables launching HTML5 apps on the device after the recent interface change.

This re-enables launching HTML5 apps on the device after the recent interface change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/159

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/228/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/ubuntu/menu.json'
--- share/qtcreator/ubuntu/menu.json	2014-04-14 10:51:35 +0000
+++ share/qtcreator/ubuntu/menu.json	2014-04-23 14:56:28 +0000
@@ -70,7 +70,7 @@
                 "ubuntuHtmlProjectRequired": true,
                 "saveRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop www /home/%USERNAME%/dev_tmp /home/%USERNAME%/.local/share/applications %USERNAME%@%IP% %PORT% --www= --inspector"
+                    "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop www /home/%USERNAME%/dev_tmp %USERNAME%@%IP% %PORT% --www= --inspector"
                 ]
             },
             {