From c3637ce66b240e0ca39efc9e97b4605edd4ec7ef Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 7 Nov 2012 14:43:09 +0100 Subject: define the module rpath in the installed module pri file the fallback path wouldn't account for a sysroot. as there is no clean way to implement that, rather remove the fallback alltogether and make the rpath a mandatory part of modules. Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d Reviewed-by: Romain Pokrzywka Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_functions.prf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mkspecs/features/qt_functions.prf') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 6da2bb6f36..a89f0838d7 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -109,11 +109,7 @@ defineTest(qtAddModule) { isEmpty(lib): lib = -l$${MODULE_NAME}$${QT_LIBINFIX} LINKAGE += $$lib - contains(QT_CONFIG, rpath) { - rpath = $$eval(QT.$${1}.rpath) - isEmpty(rpath): rpath = $$MODULE_LIBS - QMAKE_RPATHDIR *= $$rpath - } + contains(QT_CONFIG, rpath): QMAKE_RPATHDIR *= $$eval(QT.$${1}.rpath) # Make sure we can link to uninstalled libraries unix:!mac:!isEmpty(QT.$${1}.libs) { # Use unmodified path, so /usr/lib also works -- cgit v1.2.3