From 10fba42d714ad97538bbd0be6bc0b7fcb19d4688 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 16 Jul 2012 14:04:50 +0200 Subject: unifiy initialization of QMAKE_LIBS{,_PRIVATE} among windows generators Change-Id: Ib24ec6e290bfb277232c2483768c1b863f961462 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- qmake/generators/win32/mingw_make.cpp | 4 ---- qmake/generators/win32/msvc_nmake.cpp | 2 -- qmake/generators/win32/msvc_vcproj.cpp | 3 --- qmake/generators/win32/winmakefile.cpp | 3 +++ 4 files changed, 3 insertions(+), 9 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 391e83c246..fd7f07aedd 100644 --- 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")); } - // 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"); diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index e7217785b6..69ead084ac 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -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()) { diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index e7ad0bc10b..7820330da0 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -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("."); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 574d348933..acd50c7f3f 100644 --- 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); } + 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"); -- cgit v1.2.3