Fixed a bug in libdir handling.
authoraxis <qt-info@nokia.com>
Mon, 24 Jan 2011 09:14:42 +0000 (10:14 +0100)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 10:05:54 +0000 (12:05 +0200)
We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.

mkspecs/features/qt_functions.prf

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