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:
parent
5d1b4c79d2
commit
4816ca6c56
@ -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"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user