diff --git a/src/qworkbenchplugin.pri b/src/qworkbenchplugin.pri index eaf98b4f5d5f9525013c8c343a654674a6c3460c..25e02ae4747ff09007d473fe87921d005a603016 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 c57ed469f6e19684246dabd8b61728cbf549ab5a..bcf009be468de6999a8178b52cdaf63464faa6b9 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 =