diff options
| author | Andrew Patterson <andrew@avenza.com> | 2018-07-24 15:25:13 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-09-27 11:22:40 +0000 |
| commit | 857a0d4c51095e2f90274ab8246bb01e58c97dfc (patch) | |
| tree | e9cb420e4bf8fbc5b1cb9bd2f9b001eb3e1a6c6e | |
| parent | 555a6b5d5d2dd91a0dcf9e3d5fbadd1b31bf80f3 (diff) | |
Fix the /J option for MSVC project generation
Remove the DefaultCharIsUnsigned member and XML property because the
MSVC project file no longer has a specific XML tag for that setting;
instead, the /J option should go directly into the AdditionalOptions
tag.
Task-number: QTBUG-69611
Change-Id: I8f386427b7384ae09553f66193a2c9ea2b98dbc8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 300792c5af..452a215024 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -112,7 +112,6 @@ const char _Culture[] = "Culture"; const char _DLLDataFileName[] = "DLLDataFileName"; const char _DataExecutionPrevention[] = "DataExecutionPrevention"; const char _DebugInformationFormat[] = "DebugInformationFormat"; -const char _DefaultCharIsUnsigned[] = "DefaultCharIsUnsigned"; const char _DefaultCharType[] = "DefaultCharType"; const char _DelayLoadDLLs[] = "DelayLoadDLLs"; const char _DeleteExtensionsOnClean[] = "DeleteExtensionsOnClean"; @@ -358,7 +357,6 @@ VCCLCompilerTool::VCCLCompilerTool() CompileAsWinRT(unset), CompileOnly(unset), DebugInformationFormat(debugDisabled), - DefaultCharIsUnsigned(unset), Detect64BitPortabilityProblems(unset), DisableLanguageExtensions(unset), EnableEnhancedInstructionSet(archNotSet), @@ -668,7 +666,7 @@ bool VCCLCompilerTool::parseOption(const char* option) AdditionalIncludeDirectories += option+2; break; case 'J': - DefaultCharIsUnsigned = _True; + AdditionalOptions += option; break; case 'L': if(second == 'D') { @@ -2646,7 +2644,6 @@ void VCProjectWriter::write(XmlOutput &xml, const VCCLCompilerTool &tool) << attrE(_CompileAsManaged, tool.CompileAsManaged, /*ifNot*/ managedDefault) << attrT(_CompileOnly, tool.CompileOnly) << attrE(_DebugInformationFormat, tool.DebugInformationFormat, /*ifNot*/ debugUnknown) - << attrT(_DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned) << attrT(_Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems) << attrT(_DisableLanguageExtensions, tool.DisableLanguageExtensions) << attrX(_DisableSpecificWarnings, tool.DisableSpecificWarnings) |