diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-27 18:18:54 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-28 17:38:41 +0100 |
| commit | c8881e7ca2fc7249b5c88e7c485913f0df7a7c05 (patch) | |
| tree | f5ec825ff498ddbf1ab89bfefd293844281fcf73 /src/app | |
| parent | d14676dc10699bef81ad04df1a199076884c2b65 (diff) | |
| download | qt-creator-c8881e7ca2fc7249b5c88e7c485913f0df7a7c05.tar.gz | |
Support configurable library location in qbs build.
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.
Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/app.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs index aebc44643e..844536ab13 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -5,7 +5,7 @@ Application { consoleApplication: qbs.debugInformation cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."] - : ["$ORIGIN/../lib/qtcreator"] + : ["$ORIGIN/../" + project.libDirName + "/qtcreator"] cpp.defines: project.generalDefines cpp.linkerFlags: { if (qbs.buildVariant == "release" && (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw"))) |