diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-03-15 18:00:00 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-03-15 18:00:00 (GMT) |
| commit | 29b596c647d2339496458231e8eec6c63ccf4641 (patch) | |
| tree | 1ed4b329861b1f5384116714a6af3c6140dcbf49 /qmake | |
| parent | e22c6eb32c4c4c189ba5c11ce61adc8a59a0847b (diff) | |
| download | Qt-29b596c647d2339496458231e8eec6c63ccf4641.zip Qt-29b596c647d2339496458231e8eec6c63ccf4641.tar.gz Qt-29b596c647d2339496458231e8eec6c63ccf4641.tar.bz2 | |
Revert "qmake vcproj generator: do not insert $(INHERIT)"
This reverts commit e22c6eb32c4c4c189ba5c11ce61adc8a59a0847b.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 12 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 5b62b5e..020c3d8 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -355,7 +355,7 @@ VCCLCompilerTool::VCCLCompilerTool() TreatWChar_tAsBuiltInType(unset), TurnOffAssemblyGeneration(unset), UndefineAllPreprocessorDefinitions(unset), - UsePrecompiledHeader(pchUnset), + UsePrecompiledHeader(pchNone), UseUnicodeForAssemblerListing(unset), WarnAsError(unset), WarningLevel(warningLevel_0), @@ -389,7 +389,7 @@ inline XmlOutput::xml_output xformUsePrecompiledHeaderForNET2005(pchOption whatP if (whatPch == pchGenerateAuto) whatPch = (pchOption)0; if (whatPch == pchUseUsingSpecific) whatPch = (pchOption)2; } - return attrE(_UsePrecompiledHeader, whatPch, /*ifNot*/ pchUnset); + return attrE(_UsePrecompiledHeader, whatPch); } inline XmlOutput::xml_output xformExceptionHandlingNET2005(exceptionHandling eh, DotNET compilerVersion) @@ -2145,9 +2145,9 @@ void VCFilter::modifyPCHstage(QString str) useCompilerTool = true; // Setup PCH options - CompilerTool.UsePrecompiledHeader = (isCFile ? pchNone : pchCreateUsingSpecific); - if (!isCPPFile) - CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)"); + CompilerTool.UsePrecompiledHeader = (isCFile ? pchNone : pchCreateUsingSpecific); + CompilerTool.PrecompiledHeaderThrough = (isCPPFile ? QString("$(INHERIT)") : QString("$(NOINHERIT)")); + CompilerTool.ForcedIncludeFiles = QStringList("$(NOINHERIT)"); } bool VCFilter::addExtraCompiler(const VCFilterFile &info) @@ -2514,7 +2514,7 @@ void VCProjectWriter::write(XmlOutput &xml, const VCCLCompilerTool &tool) << attrT(_TurnOffAssemblyGeneration, tool.TurnOffAssemblyGeneration) << attrT(_UndefineAllPreprocessorDefinitions, tool.UndefineAllPreprocessorDefinitions) << attrX(_UndefinePreprocessorDefinitions, tool.UndefinePreprocessorDefinitions) - << xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config->CompilerVersion) + << (!tool.PrecompiledHeaderFile.isEmpty() || !tool.PrecompiledHeaderThrough.isEmpty() ? xformUsePrecompiledHeaderForNET2005(tool.UsePrecompiledHeader, tool.config->CompilerVersion) : noxml()) << attrT(_WarnAsError, tool.WarnAsError) << attrE(_WarningLevel, tool.WarningLevel, /*ifNot*/ warningLevelUnknown) << attrT(_WholeProgramOptimization, tool.WholeProgramOptimization) diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 3e62fb4..5431ce0 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -366,7 +366,6 @@ enum optLinkTimeCodeGenType { optLTCGUpdate }; enum pchOption { - pchUnset = -1, pchNone, pchCreateUsingSpecific, pchGenerateAuto, |