feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qbs submodule installation.

Browse Source 
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: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2013-03-13 14:48:26 +01:00
committed by Eike Ziller
parent 57d4d9480b
commit cea78fccbd
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qtcreator.pro
View File

@@ -31,6 +31,11 @@ exists(src/shared/qbs/qbs.pro) {
system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache") 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 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 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 contains(QT_ARCH, i386): ARCHITECTURE = x86

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -568,7 +568,7 @@ QString QbsProject::qbsBuildDir() const
QString buildDir = Utils::Environment::systemEnvironment() QString buildDir = Utils::Environment::systemEnvironment()
.value(QLatin1String("QBS_BUILD_DIR")); .value(QLatin1String("QBS_BUILD_DIR"));
if (buildDir.isEmpty()) if (buildDir.isEmpty())
buildDir = QLatin1String(QBS_BUILD_DIR); buildDir = Core::ICore::resourcePath() + QLatin1String("/qbs");
return buildDir; return buildDir;
} }

2
src/shared/qbs

Submodule src/shared/qbs updated: 652982c7b5...dcfc06010e