Merge lp:~abreu-alexandre/qtcreator-plugin-ubuntu/add-inspector-option-to-html5-run into lp:qtcreator-plugin-ubuntu

[Alexandre Abreu]

Add inspector option for remote debugging by default when launching html5 app from qtc

Add inspector option for remote debugging by default when launching html5 app from qtc

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'share/qtcreator/ubuntu/menu.json'
--- share/qtcreator/ubuntu/menu.json	2014-02-12 19:22:39 +0000
+++ share/qtcreator/ubuntu/menu.json	2014-02-18 15:12:57 +0000
@@ -83,7 +83,7 @@
                 "ubuntuHtmlProjectRequired": true,
                 "saveRequired": true,
                 "actions": [
-                    "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop ../%FOLDERNAME% /home/%USERNAME%/dev_tmp /home/%USERNAME%/.local/share/applications %USERNAME%@%IP% %PORT% --www="
+                    "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %APPRUNNEREXECNAME% %FOLDERNAME% %DISPLAYNAME%.desktop ../%FOLDERNAME% /home/%USERNAME%/dev_tmp /home/%USERNAME%/.local/share/applications %USERNAME%@%IP% %PORT% --www= --inspector"
                 ]
             },
             {

=== modified file 'share/qtcreator/ubuntu/scripts/qtc_device_run_app'
--- share/qtcreator/ubuntu/scripts/qtc_device_run_app	2014-02-10 14:15:34 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_device_run_app	2014-02-18 15:12:57 +0000
@@ -28,10 +28,12 @@
 # potential prefix that should be prepended to the target app path
 shift
 APP_LAUNCH_PREFIX=$9
+shift
+EXTRA_COMMAND_LINE_ARGS=$9
 
 APP_ID=$(echo ${DESKTOP_FILENAME}|sed "s/\.desktop//")
 
-USAGE="$0 [serialnumber] [app_launcher] [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port] [app_launch_prefix]"
+USAGE="$0 [serialnumber] [app_launcher] [foldername] [desktop_filename] [main_qml] [target_device_home] [target_device_desktop_path] [target_device] [target_device_port] [optional_app_launch_prefix] [optional_extra_command_line_args]"
 
 if [[ -z ${DESKTOP_FILENAME} || -z ${FOLDERNAME} ]]; then
 	echo ${USAGE}
@@ -91,7 +93,7 @@
 done
 echo "IMPORT: ${ARGS_FROM_DESKTOP}"
 
-COMMAND="export ${DBUS_SESSION_BUS_ADDRESS=}; APP_ID=${APP_ID} ${APP_LAUNCHER} ${ARGS_FROM_DESKTOP} ${APP_LAUNCH_PREFIX}${TARGET_DEVICE_HOME}/${APP_ID}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}"
+COMMAND="export ${DBUS_SESSION_BUS_ADDRESS=}; APP_ID=${APP_ID} ${APP_LAUNCHER} ${ARGS_FROM_DESKTOP} ${APP_LAUNCH_PREFIX}${TARGET_DEVICE_HOME}/${APP_ID}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME} ${EXTRA_COMMAND_LINE_ARGS}"
 echo "Going to execute: ${COMMAND}"
 
 # make a tar package

=== modified file 'src/ubuntu/ubunturuncontrol.cpp'
--- src/ubuntu/ubunturuncontrol.cpp	2013-12-11 16:28:52 +0000
+++ src/ubuntu/ubunturuncontrol.cpp	2014-02-18 15:12:57 +0000
@@ -35,7 +35,7 @@
     if (ubuntuProject->mainFile().compare(QString::fromLatin1("index.html"), Qt::CaseInsensitive) == 0) {
         //TODO move into abstracted location
         m_executable = QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE);
-        m_commandLineArguments = QString(QLatin1String("--www=%0")).arg(ubuntuProject->projectDirectory());
+        m_commandLineArguments = QString(QLatin1String("--www=%0 --inspector")).arg(ubuntuProject->projectDirectory());
     }
     else {
         m_executable = QtSupport::QtKitInformation::qtVersion(runConfiguration->target()->kit())->qmlsceneCommand();