diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-04 16:34:26 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-06 17:06:58 +0100 |
| commit | 169a47fe00846102d5878fe1cbe08f429c3d0342 (patch) | |
| tree | 8de01644e73fad4008410e4386909bd72beeb203 /qtcreator.pro | |
| parent | 1da5316e5cf97fce5ea6d5e5d4ceb8efd9d8848f (diff) | |
| download | qt-creator-169a47fe00846102d5878fe1cbe08f429c3d0342.tar.gz | |
QbsProjectManager: Fix Windows build.
The qbs DLL must end up in bin/ in order to be found by the plugin.
Change-Id: Ie81e7550aa51f3414d829c893ad03dcafcc9c7fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index 0ade76ddb8..54dd26060f 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -19,6 +19,14 @@ OTHER_FILES += dist/copyright_template.txt \ qtcreator.qbp \ qbs/pluginspec/pluginspec.qbs +qmake_cache = $$targetPath($$IDE_BUILD_TREE/.qmake.cache) +unix: maybe_quote = \" +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) { + system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache") +} + contains(QT_ARCH, i386): ARCHITECTURE = x86 else: ARCHITECTURE = $$QT_ARCH |