From 44fa418ce476d58bebb644b3777ebcb2a489f5c9 Mon Sep 17 00:00:00 2001 From: axis Date: Mon, 24 Jan 2011 10:14:42 +0100 Subject: [PATCH] Fixed a bug in libdir handling. We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because MSVC does not understand -L. --- qtbase/mkspecs/features/qt_functions.prf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf index a145b9d..312a0b2 100644 --- a/qtbase/mkspecs/features/qt_functions.prf +++ b/qtbase/mkspecs/features/qt_functions.prf @@ -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) } -- 1.7.3.2.343.g7d43d