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

$$QMAKE_LIBDIR contents belong into $(LIBS), not $(LFLAGS)

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2012-07-12 22:02:50 +02:00 committed by Qt by Nokia
parent 2184b27462
commit 8fa9249acc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/win32/winmakefile.cpp
View File

@ -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;
}
}