From db50c7866282c7989749d2f36eeee92b50495697 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Dec 2016 22:24:45 +0100 Subject: [PATCH 1/2] Remove hard-coded /usr/bin/ prefix from ubuntuconstants --- .../src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h b/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h index ec9550135..f78612340 100644 --- a/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h +++ b/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h @@ -117,8 +117,8 @@ const char UBUNTUPROJECT_REMOTE_RUNCONTROL_BASE_ID[] = "UbuntuProjectManager.Rem const char UBUNTUPROJECT_REMOTE_RUNCONTROL_SCOPE_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.Scope"; const char UBUNTUPROJECT_REMOTE_RUNCONTROL_APP_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.App"; -const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "/usr/bin/ubuntu-html5-app-launcher"; -const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "/usr/bin/webapp-container"; +const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher"; +const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container"; const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "qtc_desktop_scoperunner.py"; const char UBUNTUBZR_INITIALIZE[] ="%0/qtc_bzr_info"; @@ -280,9 +280,9 @@ const char TASK_DEVICE_SCRIPT[] = "Ubuntu.Task.DeviceScript"; const char UBUNTU_SETTINGS_ICON[] = ":/ubuntu/images/ubuntu-32.png"; //review tools -const char CLICK_REVIEWERSTOOLS_BINARY[] = "/usr/bin/click-review"; +const char CLICK_REVIEWERSTOOLS_BINARY[] = "click-review"; const char CLICK_REVIEWERSTOOLS_ARGS[] = "--sdk \"%0\""; -const char CLICK_REVIEWERSTOOLS_LOCATION[] = "/usr/bin/click-review --sdk \"%0\""; +const char CLICK_REVIEWERSTOOLS_LOCATION[] = "click-review --sdk \"%0\""; //build configuration const char UBUNTU_CLICK_OPEN_TERMINAL_ERROR[] = "Error when starting terminal"; @@ -294,8 +294,8 @@ const char UBUNTU_CLICK_SERIES_REGEX[] = "^DISTRIB_CODENAME=([A-Za-z]+)$"; const char UBUNTU_CLICK_CHROOT_SUFFIX_ENV_VAR[] = "CLICK_CHROOT_SUFFIX"; const char UBUNTU_CLICK_CHROOT_DEFAULT_NAME[] = "click"; -const char UBUNTU_CLICK_BINARY[] = "/usr/bin/click"; -const char UBUNTU_SUDO_BINARY[] = "/usr/bin/pkexec"; +const char UBUNTU_CLICK_BINARY[] = "click"; +const char UBUNTU_SUDO_BINARY[] = "pkexec"; const QString UBUNTU_TARGET_TOOL = QStandardPaths::findExecutable(QStringLiteral("usdk-target")); const char UBUNTU_CREATE_CLICK_TARGET_ARGS[] = "env USDK_TEST_REMOTE=\"%0\" %1 create -n %2 -p %3"; From 6f0ad25a80b89bba5d3a21f2f0db7e2dcbeb680d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 16 Dec 2016 11:47:09 +0100 Subject: [PATCH 2/2] Revert UBUNTUHTML_PROJECT_LAUNCHER_EXE for now --- dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h b/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h index f78612340..dd162e340 100644 --- a/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h +++ b/dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h @@ -117,7 +117,7 @@ const char UBUNTUPROJECT_REMOTE_RUNCONTROL_BASE_ID[] = "UbuntuProjectManager.Rem const char UBUNTUPROJECT_REMOTE_RUNCONTROL_SCOPE_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.Scope"; const char UBUNTUPROJECT_REMOTE_RUNCONTROL_APP_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.App"; -const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher"; +const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "/usr/bin/ubuntu-html5-app-launcher"; const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container"; const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "qtc_desktop_scoperunner.py";