qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Oswald Buddenhagen 2012-04-11 18:25:29 +02:00
parent 5d1b4c79d2
commit 4816ca6c56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt_functions.prf
View File

@ -94,10 +94,10 @@ defineTest(qtAddModule) {
} }
isEmpty(LINKAGE) { isEmpty(LINKAGE) {
# Make sure we can link to uninstalled libraries
!isEmpty(MODULE_LIBS) { !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" unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
} }
} }