diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-11 11:02:13 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-12 09:08:06 +0000 |
| commit | 33a0c11a5fee3fb70163c055ba2d1cc64b5130e1 (patch) | |
| tree | b9f3ee2951ae9f7b2a0ec3e8510d66fc4e5c60d2 /qbs-resources | |
| parent | aa7666835d8c4f105e111cd55d80c5fcd5a02c47 (diff) | |
Fix qbs build
Was broken by 5a1bb1db8e.
We must not use FileInfo::cleanPath() on the string "$ORIGIN/../lib", as
that will simply strip away the first two components.
Also, use joinPaths() rather than resolvePath() to construct the paths
(as we always want to concatenate, even if the second argument looks
like an absolute path), and don't read qbs.installRoot unnecessarily.
Change-Id: Idf919c664a2e0ef1ea9a4052d1d0e591a52a234c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs index accc5c4b0..b7ae7e8a0 100644 --- a/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs-resources/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -38,11 +38,9 @@ Module { return a; } } - return [FileInfo.cleanPath(FileInfo.joinPaths(rpathOrigin, FileInfo.relativePath( - FileInfo.resolvePath(qbs.installRoot, - product.targetInstallDir), - FileInfo.resolvePath(qbs.installRoot, - libDirName))))]; + return [FileInfo.joinPaths(rpathOrigin, FileInfo.relativePath( + FileInfo.joinPaths('/', product.targetInstallDir), + FileInfo.joinPaths('/', libDirName)))]; } return []; } |