diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-13 01:45:55 -0700 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-06-13 12:33:34 +0000 |
| commit | b6a6796d5ba817c42a5fc42fd02c9dd500a5b146 (patch) | |
| tree | d0b2354962544a264db9245566d2b2279ac3e736 /qbs/imports | |
| parent | e6f069575108bf2c4e99a1497a65fb84b3f50d7d (diff) | |
Change installNamePrefix to sonamePrefix in accordance with Qbs 1.5.
Task-number: QTCREATORBUG-16428
Change-Id: I219a388460ba359aec76671ba1a3b01ac4509372
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 4 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index 0738e47c09..684a18cb12 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 aa97a8bc10..88ec4dff16 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/.."] |