diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-07-12 14:09:01 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-07-12 13:03:40 +0000 |
| commit | 2856a804c8c2d512bc8a3260501e564c29ee73d6 (patch) | |
| tree | 4a51f9e54f1cabd8f6830d4cb556739bd59b3f77 /qbs-resources | |
| parent | 55e1e722291fc146bad29176aeb25bac3b65b3a0 (diff) | |
Remove compatibility code for building qbs with qbs < 1.11
Change-Id: Ib425ea13906e89ee59b11bb22b7778bd0b88070c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index a4bb3aef1..44c43310e 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -2,6 +2,7 @@ import qbs import qbs.FileInfo Module { + Depends { name: "cpp" } property bool enableUnitTests: false property bool enableProjectFileUpdates: false property bool enableRPath: true @@ -28,16 +29,9 @@ Module { property string relativeLibexecPath: "../" + libexecInstallDir property string relativePluginsPath: "../" + libDirName property string relativeSearchPath: ".." - property string rpathOrigin: { - // qbs < 1.11 compatibility for cpp.rpathOrigin - if (qbs.targetOS.contains("darwin")) - return "@loader_path"; - if (qbs.targetOS.contains("unix")) - return "$ORIGIN"; - } property stringList libRPaths: { - if (enableRPath && rpathOrigin && product.targetInstallDir) { - return [FileInfo.joinPaths(rpathOrigin, FileInfo.relativePath( + if (enableRPath && cpp.rpathOrigin && product.targetInstallDir) { + return [FileInfo.joinPaths(cpp.rpathOrigin, FileInfo.relativePath( FileInfo.joinPaths('/', product.targetInstallDir), FileInfo.joinPaths('/', libDirName)))]; } |