diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-30 01:00:19 +0200 |
| commit | 07e92611050f78dae93bcd362112efd8efa7b41e (patch) | |
| tree | 6951f77a6344436150c4f83f407e09d946f2c6c3 /qmake | |
| parent | 69e68218e5082166d5c4ab1903fbacde00418a1c (diff) | |
| parent | caa598c843eb27fd0c645e62723fd2d4e3e12f60 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaa438d14357be1bf75bb645cb8d3245947c055b8
Diffstat (limited to 'qmake')
| -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 0406da584b..4f0cee65e1 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) |