From 4816ca6c56b6326ecd78e82201e5ecb42c7ed1ee Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 11 Apr 2012 18:25:29 +0200
Subject: always add library path from module

that way we can theoretically support modules outside $QTDIR.
also, it's just cleaner.

Change-Id: I6139ebc7328b64ace8552b3e54f9a8c69248ceec
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 mkspecs/features/qt_functions.prf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mkspecs/features/qt_functions.prf')

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index d0e90ce9e7..8ae9aafcff 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -94,10 +94,10 @@ defineTest(qtAddModule) {
     }
 
     isEmpty(LINKAGE) {
-       # Make sure we can link to uninstalled libraries
        !isEmpty(MODULE_LIBS) {
-           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
-               QMAKE_LIBDIR *= $$MODULE_LIBS
+           QMAKE_LIBDIR *= $$MODULE_LIBS
+           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) {
+               # Make sure we can link to uninstalled libraries
                unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
            }
        }
-- 
cgit v1.2.3