summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-04-29 09:15:35 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-04-29 15:13:51 (GMT)
commit070ac81db30d25f129a2ec94c227ab74ce00b8d3 (patch)
treea5854db0e14d5298cd4438e017708530dd72110d /qmake
parente709077eff4d8b05cc9022d85dcb48587d96c720 (diff)
downloadQt-070ac81db30d25f129a2ec94c227ab74ce00b8d3.zip
Qt-070ac81db30d25f129a2ec94c227ab74ce00b8d3.tar.gz
Qt-070ac81db30d25f129a2ec94c227ab74ce00b8d3.tar.bz2
qmake: remove useless evaluation of variables from VS project generators
The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE, QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf files in mkspecs/features and don't need to be evaluated by generators. Reviewed-by: ossi
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp8
-rw-r--r--qmake/generators/win32/msvc_vcxproj.cpp8
2 files changed, 0 insertions, 16 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 1b4e51b..35e4896 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -917,14 +917,12 @@ void VcprojGenerator::initCompilerTool()
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
if(project->isActiveConfig("debug")){
// Debug version
- conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG"));
if((projectTarget == Application) || (projectTarget == StaticLib))
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG"));
else
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLLDBG"));
} else {
// Release version
- conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE"));
conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
conf.compiler.PreprocessorDefinitions += "NDEBUG";
if((projectTarget == Application) || (projectTarget == StaticLib))
@@ -996,12 +994,6 @@ void VcprojGenerator::initLinkerTool()
conf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
- if(project->isActiveConfig("debug")){
- conf.linker.parseOptions(project->values("QMAKE_LFLAGS_DEBUG"));
- } else {
- conf.linker.parseOptions(project->values("QMAKE_LFLAGS_RELEASE"));
- }
-
if(project->isActiveConfig("dll")){
conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL"));
}
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index 85239fe..76aa2a9 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -294,14 +294,12 @@ void VcxprojGenerator::initCompilerTool()
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
if(project->isActiveConfig("debug")){
// Debug version
- conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG"));
if((projectTarget == Application) || (projectTarget == StaticLib))
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DBG"));
else
conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_MT_DLLDBG"));
} else {
// Release version
- conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE"));
conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
conf.compiler.PreprocessorDefinitions += "NDEBUG";
if((projectTarget == Application) || (projectTarget == StaticLib))
@@ -359,12 +357,6 @@ void VcxprojGenerator::initLinkerTool()
conf.linker.OutputFile += project->first("MSVCPROJ_TARGET");
- if(project->isActiveConfig("debug")){
- conf.linker.parseOptions(project->values("QMAKE_LFLAGS_DEBUG"));
- } else {
- conf.linker.parseOptions(project->values("QMAKE_LFLAGS_RELEASE"));
- }
-
if(project->isActiveConfig("dll")){
conf.linker.parseOptions(project->values("QMAKE_LFLAGS_QT_DLL"));
}