diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-13 14:48:26 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-14 08:20:15 +0100 |
| commit | cea78fccbdfa6a087df5c8cc0af65c7e360bbaf8 (patch) | |
| tree | b180d67fcb416e41386f1c740b08d825ed82e57c /qtcreator.pro | |
| parent | 57d4d9480b33908e0b727f7067554ec82d25ed51 (diff) | |
| download | qt-creator-cea78fccbdfa6a087df5c8cc0af65c7e360bbaf8.tar.gz | |
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: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index bd868bd38b..532053369d 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -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 |