diff options
| author | axis <qt-info@nokia.com> | 2011-01-24 10:14:42 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:54 +0200 |
| commit | a93039b229344341d6faa3ecd6d35ee8aec381fc (patch) | |
| tree | 8ddf0c37d86d6331b0be4e2581ec51732d6b6aa2 /mkspecs | |
| parent | 0f7380b2e711700c94c9c330dcc7212515a3fa16 (diff) | |
Fixed a bug in libdir handling.
We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index df4508d85c..c44419c4f2 100644 --- a/mkspecs/features/qt_functions.prf +++ b/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) } |