AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug in libdir handling.

Browse Source 
We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.
This commit is contained in:
axis 2011-01-24 10:14:42 +01:00
parent 0f7380b2e7
commit a93039b229
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/qt_functions.prf
View File

@ -131,7 +131,7 @@ defineTest(qtAddModule) {
isEmpty(LINKAGE) { isEmpty(LINKAGE) {
# Make sure we can link to uninstalled libraries # Make sure we can link to uninstalled libraries
!isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) {
QMAKE_LFLAGS *= -L$$MODULE_LIBS QMAKE_LIBDIR *= $$MODULE_LIBS
unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
} }
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
@ -152,6 +152,7 @@ defineTest(qtAddModule) {
export(INCLUDEPATH) export(INCLUDEPATH)
export(QMAKE_FRAMEWORKPATH) export(QMAKE_FRAMEWORKPATH)
export(QMAKE_LFLAGS) export(QMAKE_LFLAGS)
export(QMAKE_LIBDIR)
return(true) return(true)
} }