support -rpath for modules which are not installed to QT_INSTALL_PREFIX

a module's project file may set MODULE_INSTALL_LIBS before loading
qt_module.prf to have an alternative RPATH linked into the users of that
module.
this is relevant only for linking against non-installed -prefix builds
of that module, as otherwise .libs from the module's pri file is used
for rpath.

Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 8daa2c4bbe..a8f4d34268 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -94,6 +94,12 @@ defineTest(qtAddModule) {
        isEmpty(lib): lib = -l$${MODULE_NAME}$${QT_LIBINFIX}
        LINKAGE += $$lib
 
+       contains(QT_CONFIG, rpath) {
+           rpath = $$eval(QT.$${MODULE}.rpath)
+           isEmpty(rpath): rpath = $$MODULE_LIBS
+           QMAKE_RPATHDIR *= $$rpath
+       }
+
        # Make sure we can link to uninstalled libraries
        unix:!mac:!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works
             for(rpl, QT.$${1}.rpath_link): \
@@ -120,6 +126,7 @@ defineTest(qtAddModule) {
     export(QMAKE_FRAMEWORKPATH)
     export(QMAKE_LFLAGS)
     export(QMAKE_LIBDIR)
+    export(QMAKE_RPATHDIR)
     return(true)
 }