Commit cea78fcc authored by Christian Kandeler's avatar Christian Kandeler Committed by Eike Ziller

Fix qbs submodule installation.

We want the qbs library and resources to be placed in
the canonical places when installing Qt Creator. This
also makes it necessary to change the location of the
respective files in the build directory.

Change-Id: I8e78ec5aa0e8b728ccca96d45a647c1488961ea0
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 57d4d948
......@@ -31,6 +31,11 @@ exists(src/shared/qbs/qbs.pro) {
system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache")
system("echo QBS_DESTDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
system("echo QBSLIBDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
system("echo QBS_INSTALL_PREFIX = $${QTC_PREFIX} >> $$qmake_cache")
system("echo QBS_LIB_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
system("echo QBS_RESOURCES_BUILD_DIR = $${maybe_backslash}\"$${IDE_DATA_PATH}/qbs$${maybe_backslash}\" >> $$qmake_cache")
system("echo QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs >> $$qmake_cache")
system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
}
contains(QT_ARCH, i386): ARCHITECTURE = x86
......
......@@ -568,7 +568,7 @@ QString QbsProject::qbsBuildDir() const
QString buildDir = Utils::Environment::systemEnvironment()
.value(QLatin1String("QBS_BUILD_DIR"));
if (buildDir.isEmpty())
buildDir = QLatin1String(QBS_BUILD_DIR);
buildDir = Core::ICore::resourcePath() + QLatin1String("/qbs");
return buildDir;
}
......
Subproject commit 652982c7b5cb1138d5d339870bad0bbbb1f1c1e0
Subproject commit dcfc06010eb622adc4e90b8d77e5db25aa6219d9
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