diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-12 22:02:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-24 12:45:02 +0200 |
| commit | 8fa9249acc37ea8ae41a25bbb7444560663985f7 (patch) | |
| tree | cafc3bc5b7c768784cc36b0e0e28b8798f94b059 /qmake | |
| parent | 2184b27462d6ce34e6cdb47e5008d473d29a447f (diff) | |
$$QMAKE_LIBDIR contents belong into $(LIBS), not $(LFLAGS)
unlike for the unix linker, this does not matter for the windows linker,
but keeping it consistent has advantages.
Change-Id: Ib9b9efa18c31d87c026d3cac5a8737f4612ad1c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 2af7b811dd..574d348933 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -764,11 +764,11 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) t << "LIBFLAGS = " << var("QMAKE_LIBFLAGS") << endl; } else { t << "LINK = " << var("QMAKE_LINK") << endl; - t << "LFLAGS = "; + t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; + t << "LIBS = "; if(!project->values("QMAKE_LIBDIR").isEmpty()) writeLibDirPart(t); - t << var("QMAKE_LFLAGS") << endl; - t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; + t << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; } } |