From c3d75e66d16169fbde9edf9d6844560373d8492d Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 17 Feb 2011 15:43:21 +0100
Subject: [PATCH] Fix compilation and rpath with the ssh class move.
---
src/libs/utils/utils.pri | 1 +
src/libs/utils/utils.pro | 4 ++--
src/libs/utils/utils_dependencies.pri | 1 +
src/plugins/coreplugin/coreplugin_dependencies.pri | 1 -
src/rpath.pri | 2 ++
5 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 src/libs/utils/utils_dependencies.pri
diff --git a/src/libs/utils/utils.pri b/src/libs/utils/utils.pri
index f6e523b74d7..414ef2bd868 100644
--- a/src/libs/utils/utils.pri
+++ b/src/libs/utils/utils.pri
@@ -1 +1,2 @@
+include(utils_dependencies.pri)
LIBS *= -l$$qtLibraryName(Utils)
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index dbf97987c28..29e910f335c 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -4,8 +4,8 @@ QT += gui \
network
CONFIG += dll
-include($$PWD/../../qtcreatorlibrary.pri)
-include($$PWD/../3rdparty/botan/botan.pri)
+include(../../qtcreatorlibrary.pri)
+include(utils_dependencies.pri)
include(utils-lib.pri)
diff --git a/src/libs/utils/utils_dependencies.pri b/src/libs/utils/utils_dependencies.pri
new file mode 100644
index 00000000000..e2a3c96f457
--- /dev/null
+++ b/src/libs/utils/utils_dependencies.pri
@@ -0,0 +1 @@
+include(../3rdparty/botan/botan.pri)
diff --git a/src/plugins/coreplugin/coreplugin_dependencies.pri b/src/plugins/coreplugin/coreplugin_dependencies.pri
index e908601b226..8b548e71796 100644
--- a/src/plugins/coreplugin/coreplugin_dependencies.pri
+++ b/src/plugins/coreplugin/coreplugin_dependencies.pri
@@ -1,3 +1,2 @@
include(../../libs/extensionsystem/extensionsystem.pri)
include(../../libs/utils/utils.pri)
-include(../../libs/3rdparty/botan/botan.pri)
diff --git a/src/rpath.pri b/src/rpath.pri
index c0882c41154..a3dff7a9df7 100644
--- a/src/rpath.pri
+++ b/src/rpath.pri
@@ -8,6 +8,8 @@ macx {
} 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
+ QMAKE_RPATHDIR += \$\$ORIGIN
+ QMAKE_RPATHDIR += \$\$ORIGIN/..
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
--
GitLab