feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix location and rpaths of qbs command-line tools on OSX.

Browse Source 
Change-Id: I3393ac940b60b8741e503420d9d0b44c12423bcb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Christian Kandeler
2014-06-25 15:09:59 +02:00
parent 7fbd4b7c6a
commit 91ee7d1451
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/qbs

Submodule src/shared/qbs updated: a68470880a...5e77a9d192

5
src/src.qbs
View File

@@ -26,10 +26,11 @@ Project {
property bool installApiHeaders: false property bool installApiHeaders: false
property string libInstallDir: project.ide_library_path property string libInstallDir: project.ide_library_path
property stringList libRPaths: qbs.targetOS.contains("osx") property stringList libRPaths: qbs.targetOS.contains("osx")
? ["@loader_path/.."] : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path] ? ["@loader_path/" + FileInfo.relativePath(appInstallDir, libInstallDir)]
: ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
property string resourcesInstallDir: project.ide_data_path + "/qbs" property string resourcesInstallDir: project.ide_data_path + "/qbs"
property string pluginsInstallDir: project.libDirName + "/qtcreator" property string pluginsInstallDir: project.libDirName + "/qtcreator"
property string appInstallDir: project.ide_libexec_path property string appInstallDir: project.ide_bin_path
property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir) property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir)
property string relativeSearchPath: FileInfo.relativePath(appInstallDir, property string relativeSearchPath: FileInfo.relativePath(appInstallDir,
resourcesInstallDir) resourcesInstallDir)