always add library path from module
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 11 Apr 2012 16:25:29 +0000 (18:25 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 19 Jun 2012 14:45:58 +0000 (16:45 +0200)
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

index d0e90ce..8ae9aaf 100644 (file)
@@ -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"
            }
        }