diff options
| author | con <qtc-committer@nokia.com> | 2010-11-01 12:15:49 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-11-01 15:00:25 +0100 |
| commit | 49b86e771761b3a9a1799d11f777b13077c6305e (patch) | |
| tree | 8ac9c7bb617654b82e5c75c3cd44b25a5c253941 /src/rpath.pri | |
| parent | 59c301a8c8ce9daa2c47f4651b39c7a1fed7226c (diff) | |
Mac: Use rpath instead of executable_path.
Because executable_path and loader_path are just too inflexible for some
stuff. The rpath is supposed to be set to the Qt Creator app's Contents
folder.
Compiling on 10.4 now requires to enter compatibility mode via
QTC_TIGER_COMPAT env variable or TIGER_COMPAT_MODE qmake variable.
Diffstat (limited to 'src/rpath.pri')
| -rw-r--r-- | src/rpath.pri | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rpath.pri b/src/rpath.pri index 750d0ed4d8..c0882c4115 100644 --- a/src/rpath.pri +++ b/src/rpath.pri @@ -1,5 +1,10 @@ macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/ + !isEmpty(TIGER_COMPAT_MODE) { + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/ + } else { + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../ + } } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var |