diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-29 16:27:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-05 18:32:10 +0200 |
| commit | 2a4a56b2beec7a3c0be94302146461d2f730315d (patch) | |
| tree | 1c40b80c79d31869619678fc6260dfd5bf503e29 /src/rpath.pri | |
| parent | c6a9de7252bf4f2a7592153caaabe13ebad8c4eb (diff) | |
Load plugins from user config directory too.
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.
Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/rpath.pri')
| -rw-r--r-- | src/rpath.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpath.pri b/src/rpath.pri index a3dff7a9df..c352a823b3 100644 --- a/src/rpath.pri +++ b/src/rpath.pri @@ -3,7 +3,7 @@ macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/ } else { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ } } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR |