Fix compilation and rpath with the ssh class move.

src/libs/utils/utils.pri

@@ -1 +1,2 @@
+include(utils_dependencies.pri)
 LIBS *= -l$$qtLibraryName(Utils)

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)
 

src/libs/utils/utils_dependencies.pri

@@ -0,0 +1 @@
+include(../3rdparty/botan/botan.pri)

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)

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, ":")