From 91ee7d1451d48ad9a86809b1fa8381857e79048c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 25 Jun 2014 15:09:59 +0200 Subject: [PATCH] Fix location and rpaths of qbs command-line tools on OSX. Change-Id: I3393ac940b60b8741e503420d9d0b44c12423bcb Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- src/src.qbs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/shared/qbs b/src/shared/qbs index a68470880a0..5e77a9d1927 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit a68470880a0195f7a52caad46b442df694cb26b0 +Subproject commit 5e77a9d1927ec4f3ab405824a92d48930d48c487 diff --git a/src/src.qbs b/src/src.qbs index 387b13acd8c..5301b6a4f5a 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -26,10 +26,11 @@ Project { property bool installApiHeaders: false property string libInstallDir: project.ide_library_path 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 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 relativeSearchPath: FileInfo.relativePath(appInstallDir, resourcesInstallDir)