diff options
author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-13 13:57:23 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-13 14:05:28 +0100 |
commit | ae3d764aaf894e0c5177ffa4427494486bc5ac68 (patch) | |
tree | 31291cba9443f60994c13fa2a5d02282d003db65 /qbs.qbs | |
parent | 55b81b5be50a36048b99af2ba78b6e2faf0d6ef9 (diff) | |
parent | d8a90f254e37cd40cc2a684e584a579689a4fb16 (diff) |
Merge branch '1.3' into master.
Conflicts:
tests/auto/blackbox/tst_blackbox.h
Change-Id: If48c717626f468c46ad7f1208365275135074404
Diffstat (limited to 'qbs.qbs')
-rw-r--r-- | qbs.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,7 +14,7 @@ Project { property string relativePluginsPath: "../" + libDirName property string relativeSearchPath: ".." property stringList libRPaths: { - if (!project.enableRPath) + if (!enableRPath) return undefined; if (qbs.targetOS.contains("linux")) return ["$ORIGIN/../" + libDirName]; |