Introduce cpp.rpathOrigin

[ChangeLog] Added property cpp.rpathOrigin which evaluates to
@loader_path on Darwin and $ORIGIN on other Unix-like platforms.

Change-Id: If5770a83ae32f29ee520fd00b07ed8f0caf6bd48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
index c2b57645c..f8f5e3e5c 100644
--- a/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
+++ b/tests/auto/blackbox/testdata-apple/apple-multiconfig/apple-multiconfig.qbs
@@ -10,7 +10,7 @@ Project {
         name: "singleapp"
         targetName: "singleapp"
         files: ["app.c"]
-        cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../../../"] : []
+        cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
 
         // Turn off multiplexing
@@ -30,7 +30,7 @@ Project {
         name: "singleapp_agg"
         targetName: "singleapp_agg"
         files: ["app.c"]
-        cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../../../"] : []
+        cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
 
         // Force aggregation when not needed
@@ -71,7 +71,7 @@ Project {
         name: "multiapp"
         targetName: "multiapp"
         files: ["app.c"]
-        cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../../../"] : []
+        cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
 
         Group {
@@ -87,7 +87,7 @@ Project {
         name: "fatmultiapp"
         targetName: "fatmultiapp"
         files: ["app.c"]
-        cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../../../"] : []
+        cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
         qbs.architectures: ["x86", "x86_64"]
 
@@ -104,7 +104,7 @@ Project {
         name: "fatmultiappmultivariant"
         targetName: "fatmultiappmultivariant"
         files: ["app.c"]
-        cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../../../"] : []
+        cpp.rpaths: [cpp.rpathOrigin + "/../../../"]
         cpp.minimumMacosVersion: "10.5"
         qbs.architectures: ["x86", "x86_64"]
         qbs.buildVariants: ["debug", "profile"]
diff --git a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
index 87c0aaa36..c0d77aefd 100644
--- a/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
+++ b/tests/auto/blackbox/testdata-apple/embedInfoPlist/embedInfoPlist.qbs
@@ -8,7 +8,7 @@ Project {
         consoleApplication: true
         files: ["main.m"]
         cpp.frameworks: ["Foundation"]
-        cpp.rpaths: ["@loader_path"]
+        cpp.rpaths: [cpp.rpathOrigin]
         cpp.minimumMacosVersion: "10.5"
         bundle.infoPlist: ({
             "QBS": "org.qt-project.qbs.testdata.embedInfoPlist"