Commit 9b9814fd authored by Christian Kandeler's avatar Christian Kandeler

Fix default search and plugin path for qbs.

That is, the qbs command-line frontend that we build.

Task-number: QTCREATORBUG-12474
Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
parent d17157f8
......@@ -54,6 +54,8 @@ exists(src/shared/qbs/qbs.pro) {
system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache")
system("echo QBS_APPS_DESTDIR = $${maybe_backslash}\"$${IDE_BIN_PATH}$${maybe_backslash}\">> $$qmake_cache")
system("echo QBS_APPS_INSTALL_DIR = $${QTC_PREFIX}/bin >> $$qmake_cache")
system("echo QBS_RELATIVE_PLUGINS_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_PLUGINS_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache)
system("echo QBS_RELATIVE_SEARCH_PATH = $${maybe_backslash}\$$${maybe_backslash}\$relative_path$${maybe_backslash}\($${maybe_backslash}\$$${maybe_backslash}\$QBS_RESOURCES_BUILD_DIR, $${maybe_backslash}\$$${maybe_backslash}\$QBS_APPS_DESTDIR$${maybe_backslash}\)" >> $$qmake_cache)
system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
}
......
Subproject commit 6d72bca8f84ff2b9a83a34a361acc3a4d510ad74
Subproject commit a68470880a0195f7a52caad46b442df694cb26b0
import qbs
import qbs.File
import qbs.FileInfo
Project {
name: "Sources"
......@@ -29,6 +30,9 @@ Project {
property string resourcesInstallDir: project.ide_data_path + "/qbs"
property string pluginsInstallDir: project.libDirName + "/qtcreator"
property string appInstallDir: project.ide_libexec_path
property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir)
property string relativeSearchPath: FileInfo.relativePath(appInstallDir,
resourcesInstallDir)
references: [
qbsBaseDir + "/src/lib/libs.qbs",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment