ubports-cn/ubuntu-sdk-ide_orig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove hard-coded /usr/bin/ prefix from ubuntuconstants. Fixes: https://bugs.launchpad.net/bugs/1647484.

Browse Source 
Approved by ubuntu-sdk-build-bot, Benjamin Zeller.
This commit is contained in:
Christian Dywan
2016-12-16 11:32:19 +00:00
committed by Tarmac
parent 8fa8282047 6f0ad25a80
commit a67a06bd7e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h vendored
View File

@@ -118,7 +118,7 @@ const char UBUNTUPROJECT_REMOTE_RUNCONTROL_SCOPE_ID[] = "UbuntuProjectManager.Re
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 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";