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/qtcreatorplugin.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/qtcreatorplugin.pri')
-rw-r--r-- | src/qtcreatorplugin.pri | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index a13d519dc8..f27097c037 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -28,7 +28,12 @@ QMAKE_EXTRA_COMPILERS += copy2build macx { + !isEmpty(TIGER_COMPAT_MODE) { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ + } else { + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../ + } } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR QMAKE_RPATHDIR += \$\$ORIGIN |