diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-03 12:36:01 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-08-10 08:52:57 (GMT) |
| commit | 550bef106d54cd649764c320758da912fae4db3e (patch) | |
| tree | 0556cb5ff278a6b8234d5bdd252f3ed257d5c85c /qmake | |
| parent | a746c8dd6a1932f97ee2a4b1ef1821aac876b96b (diff) | |
| download | Qt-550bef106d54cd649764c320758da912fae4db3e.zip Qt-550bef106d54cd649764c320758da912fae4db3e.tar.gz Qt-550bef106d54cd649764c320758da912fae4db3e.tar.bz2 | |
qmake: no need to add the _WINDOWS define twice
This is already done by MSVCPROJ_WINCONDEF.
Reviewed-by: ossi
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.cpp | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 4cb8f5a..01331b3 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -887,7 +887,6 @@ void VcprojGenerator::initConfiguration() } else { conf.compiler.PreprocessorDefinitions += "NDEBUG"; } - } void VcprojGenerator::initCompilerTool() @@ -921,11 +920,6 @@ void VcprojGenerator::initCompilerTool() if(project->isActiveConfig("windows")) conf.compiler.PreprocessorDefinitions += project->values("MSVCPROJ_WINCONDEF"); - // Can this be set for ALL configs? - // If so, use qmake.conf! - if(projectTarget == SharedLib) - conf.compiler.PreprocessorDefinitions += "_WINDOWS"; - conf.compiler.PreprocessorDefinitions += project->values("DEFINES"); conf.compiler.PreprocessorDefinitions += project->values("PRL_EXPORT_DEFINES"); conf.compiler.parseOptions(project->values("MSVCPROJ_INCPATH")); diff --git a/qmake/generators/win32/msvc_vcxproj.cpp b/qmake/generators/win32/msvc_vcxproj.cpp index 4073961..34e75f8 100644 --- a/qmake/generators/win32/msvc_vcxproj.cpp +++ b/qmake/generators/win32/msvc_vcxproj.cpp @@ -263,7 +263,6 @@ void VcxprojGenerator::initConfiguration() } } - void VcxprojGenerator::initCompilerTool() { QString placement = project->first("OBJECTS_DIR"); @@ -297,11 +296,6 @@ void VcxprojGenerator::initCompilerTool() if(project->isActiveConfig("windows")) conf.compiler.PreprocessorDefinitions += project->values("MSVCPROJ_WINCONDEF"); - // Can this be set for ALL configs? - // If so, use qmake.conf! - if(projectTarget == SharedLib) - conf.compiler.PreprocessorDefinitions += "_WINDOWS"; - conf.compiler.PreprocessorDefinitions += project->values("DEFINES"); conf.compiler.PreprocessorDefinitions += project->values("PRL_EXPORT_DEFINES"); conf.compiler.parseOptions(project->values("MSVCPROJ_INCPATH")); |