From b6a6796d5ba817c42a5fc42fd02c9dd500a5b146 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 13 Jun 2016 01:45:55 -0700 Subject: Change installNamePrefix to sonamePrefix in accordance with Qbs 1.5. Task-number: QTCREATORBUG-16428 Change-Id: I219a388460ba359aec76671ba1a3b01ac4509372 Reviewed-by: Eike Ziller Reviewed-by: Christian Kandeler --- qbs/imports/QtcLibrary.qbs | 4 +++- qbs/imports/QtcPlugin.qbs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'qbs/imports') diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index 0738e47c099..684a18cb12f 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -21,7 +21,9 @@ QtcProduct { flags.push("-compatibility_version", qtc.qtcreator_compat_version); return flags; } - cpp.installNamePrefix: "@rpath" + cpp.sonamePrefix: qbs.targetOS.contains("osx") + ? "@rpath" + : undefined cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../Frameworks"] : ["$ORIGIN", "$ORIGIN/.."] diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index aa97a8bc106..88ec4dff16a 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -26,7 +26,9 @@ QtcProduct { cpp.createSymlinks: false cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.installNamePrefix: "@rpath" + cpp.sonamePrefix: qbs.targetOS.contains("osx") + ? "@rpath" + : undefined cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"] : ["$ORIGIN", "$ORIGIN/.."] -- cgit v1.2.3