diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-11 18:09:00 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-13 09:33:06 +0100 |
| commit | 36e1c03ae6bfe2966b66b5c7e84a2c83c377422b (patch) | |
| tree | 7741556f31cc0949b1a51e519d7345241549066c /qtcreator.pro | |
| parent | 07d3e712fe53670e09f898b89bf2bdb7004a5fde (diff) | |
| download | qt-creator-36e1c03ae6bfe2966b66b5c7e84a2c83c377422b.tar.gz | |
Update qbs submodule and make use of the new QBS_DESTDIR variable.
Change-Id: I3cc3e1f20fdd122f9f493c25d15902e926fe0ad9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 066b098721..bd868bd38b 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -21,11 +21,16 @@ OTHER_FILES += dist/copyright_template.txt \ qbs/pluginspec/pluginspec.qbs qmake_cache = $$targetPath($$IDE_BUILD_TREE/.qmake.cache) -unix: maybe_quote = \" +equals(QMAKE_DIR_SEP, /): { + maybe_quote = "\"" + maybe_backslash = "\\" +} system("echo $${maybe_quote}$${LITERAL_HASH} config for qmake$${maybe_quote} > $$qmake_cache") # Make sure the qbs dll ends up alongside the Creator executable. -win32:exists(src/shared/qbs/qbs.pro) { +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") } contains(QT_ARCH, i386): ARCHITECTURE = x86 |