whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unifiy initialization of QMAKE_LIBS{,_PRIVATE} among windows generators 

Change-Id: Ib24ec6e290bfb277232c2483768c1b863f961462
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
bb10
Oswald Buddenhagen 2012-07-16 14:04:50 +02:00 committed by Qt by Nokia
parent b053aaa9ef
commit 10fba42d71
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/win32/mingw_make.cpp
View File

@ -265,10 +265,6 @@ void MingwMakefileGenerator::init()
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
}
// LIBS defined in Profile comes first for gcc
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
QString targetfilename = project->values("TARGET").first();
QStringList &configs = project->values("CONFIG");

2
qmake/generators/win32/msvc_nmake.cpp
View File

@ -243,8 +243,6 @@ void NmakeMakefileGenerator::init()
return;
}
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
processVars();
if (!project->values("RES_FILE").isEmpty()) {

3
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -699,9 +699,6 @@ void VcprojGenerator::init()
processVars();
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
if(!project->values("VERSION").isEmpty()) {
QString version = project->values("VERSION")[0];
int firstDot = version.indexOf(".");

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

@ -342,6 +342,9 @@ void Win32MakefileGenerator::processVars()
(*libDir_it) = Option::fixPathToTargetOS((*libDir_it), false, false);
}
project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS"));
project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE"));
if (project->values("TEMPLATE").contains("app")) {
project->values("QMAKE_CFLAGS") += project->values("QMAKE_CFLAGS_APP");
project->values("QMAKE_CXXFLAGS") += project->values("QMAKE_CXXFLAGS_APP");