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>

diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 391e83c..fd7f07a 100644 (file)
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -265,10 +265,6 @@ void MingwMakefileGenerator::init()
         project->values("QMAKE_LIBS") += escapeFilePaths(project->values("RES_FILE"));
     }
 
         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");
 
     QString targetfilename = project->values("TARGET").first();
     QStringList &configs = project->values("CONFIG");
 

diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index e721778..69ead08 100644 (file)
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -243,8 +243,6 @@ void NmakeMakefileGenerator::init()
         return;
     }
 
         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()) {
     processVars();
 
     if (!project->values("RES_FILE").isEmpty()) {

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index e7ad0bc..7820330 100644 (file)
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -699,9 +699,6 @@ void VcprojGenerator::init()
 
     processVars();
 
 
     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(".");
     if(!project->values("VERSION").isEmpty()) {
         QString version = project->values("VERSION")[0];
         int firstDot = version.indexOf(".");

diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 574d348..acd50c7 100644 (file)
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -342,6 +342,9 @@ void Win32MakefileGenerator::processVars()
         (*libDir_it) = Option::fixPathToTargetOS((*libDir_it), false, false);
     }
 
         (*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");
     if (project->values("TEMPLATE").contains("app")) {
         project->values("QMAKE_CFLAGS") += project->values("QMAKE_CFLAGS_APP");
         project->values("QMAKE_CXXFLAGS") += project->values("QMAKE_CXXFLAGS_APP");