diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-04-28 15:39:19 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-04-29 07:34:38 (GMT) |
| commit | 9b67f0b314b249b5bb7db2b9fe13f8e874f2a200 (patch) | |
| tree | 87542fc2f8dae20db397163c04a5a2b04b234cb0 | |
| parent | 6e54f5dd1b82a8f73a6b568fb2b89f1a73a4c3ae (diff) | |
| download | Qt-9b67f0b314b249b5bb7db2b9fe13f8e874f2a200.zip Qt-9b67f0b314b249b5bb7db2b9fe13f8e874f2a200.tar.gz Qt-9b67f0b314b249b5bb7db2b9fe13f8e874f2a200.tar.bz2 | |
qmake: fix duplicate compiler options in VS project files
We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF
mkspecs/features/warn_on.prf / ..._off.prf do it for us.
Reviewed-by: andy
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 8c9bba8..6cc8272 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -934,10 +934,6 @@ void VcprojGenerator::initCompilerTool() } // Common for both release and debug - if(project->isActiveConfig("warn_off")) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_OFF")); - else if(project->isActiveConfig("warn_on")) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_ON")); if(project->isActiveConfig("windows")) conf.compiler.PreprocessorDefinitions += project->values("MSVCPROJ_WINCONDEF"); diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index 6a91c6b..92caa31 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -311,10 +311,6 @@ void VcxprojGenerator::initCompilerTool() } // Common for both release and debug - if(project->isActiveConfig("warn_off")) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_OFF")); - else if(project->isActiveConfig("warn_on")) - conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_WARN_ON")); if(project->isActiveConfig("windows")) conf.compiler.PreprocessorDefinitions += project->values("MSVCPROJ_WINCONDEF"); |