From 5e7116e0e3e8eff2293fcd251a61bdeb9eb7b74c Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Wed, 21 Jan 2009 11:27:42 +0100
Subject: [PATCH] Fixes: RPATH for plugins
---
src/qworkbenchplugin.pri | 2 ++
src/rpath.pri | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qworkbenchplugin.pri b/src/qworkbenchplugin.pri
index eaf98b4f5d5..25e02ae4747 100644
--- a/src/qworkbenchplugin.pri
+++ b/src/qworkbenchplugin.pri
@@ -40,7 +40,9 @@ macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
+ QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/..
+ QMAKE_RPATHDIR += \$\$ORIGIN/../..
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
diff --git a/src/rpath.pri b/src/rpath.pri
index c57ed469f6e..bcf009be468 100644
--- a/src/rpath.pri
+++ b/src/rpath.pri
@@ -5,8 +5,6 @@ macx {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN/../lib/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
- message($$QMAKE_RPATHDIR)
- message($$IDE_PLUGIN_RPATH)
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
--
GitLab