qmake: remove VS2003 work-around from vcxproj generator

This generator is VS2010 only.

Reviewed-by: ossi

3 files changed, 3 insertions, 6 deletions

diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 92e8aeb..0adb152 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -129,10 +129,12 @@ QString NmakeMakefileGenerator::var(const QString &value)
             p.replace("-c", precompRule);
             // Cannot use -Gm with -FI & -Yu, as this gives an
             // internal compiler error, on the newer compilers
+            // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.
             p.remove("-Gm");
             return p;
         } else if (value == "QMAKE_CXXFLAGS") {
             // Remove internal compiler error option
+            // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.
             return MakefileGenerator::var(value).remove("-Gm");
         }
     }
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 01331b3..2f949ed 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -908,6 +908,7 @@ void VcprojGenerator::initCompilerTool()
         conf.compiler.ForcedIncludeFiles       = project->values("PRECOMPILED_HEADER");
         // Minimal build option triggers an Internal Compiler Error
         // when used in conjunction with /FI and /Yu, so remove it
+        // ### work-around for a VS 2003 bug. Move to some prf file or remove completely.
         project->values("QMAKE_CFLAGS_DEBUG").removeAll("-Gm");
         project->values("QMAKE_CFLAGS_DEBUG").removeAll("/Gm");
         project->values("QMAKE_CXXFLAGS_DEBUG").removeAll("-Gm");
diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp
index 34e75f8..3851270 100644
--- a/qmake/generators/win32/msvc_vcxproj.cpp
+++ b/qmake/generators/win32/msvc_vcxproj.cpp
@@ -282,12 +282,6 @@ void VcxprojGenerator::initCompilerTool()
         conf.compiler.ForcedIncludeFiles            = project->values("PRECOMPILED_HEADER");
         conf.compiler.PreprocessToFile              = _False;
         conf.compiler.PreprocessSuppressLineNumbers = _False;
-        // Minimal build option triggers an Internal Compiler Error
-        // when used in conjunction with /FI and /Yu, so remove it
-        project->values("QMAKE_CFLAGS_DEBUG").removeAll("-Gm");
-        project->values("QMAKE_CFLAGS_DEBUG").removeAll("/Gm");
-        project->values("QMAKE_CXXFLAGS_DEBUG").removeAll("-Gm");
-        project->values("QMAKE_CXXFLAGS_DEBUG").removeAll("/Gm");
     }
 
     conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));