AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the /J option for MSVC project generation

Browse Source 
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>
This commit is contained in:
Andrew Patterson 2018-07-24 15:25:13 -04:00 committed by Joerg Bornemann
parent 555a6b5d5d
commit 857a0d4c51
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -112,7 +112,6 @@ const char _Culture[] = "Culture";
const char _DLLDataFileName[] = "DLLDataFileName"; const char _DLLDataFileName[] = "DLLDataFileName";
const char _DataExecutionPrevention[] = "DataExecutionPrevention"; const char _DataExecutionPrevention[] = "DataExecutionPrevention";
const char _DebugInformationFormat[] = "DebugInformationFormat"; const char _DebugInformationFormat[] = "DebugInformationFormat";
const char _DefaultCharIsUnsigned[] = "DefaultCharIsUnsigned";
const char _DefaultCharType[] = "DefaultCharType"; const char _DefaultCharType[] = "DefaultCharType";
const char _DelayLoadDLLs[] = "DelayLoadDLLs"; const char _DelayLoadDLLs[] = "DelayLoadDLLs";
const char _DeleteExtensionsOnClean[] = "DeleteExtensionsOnClean"; const char _DeleteExtensionsOnClean[] = "DeleteExtensionsOnClean";
@ -358,7 +357,6 @@ VCCLCompilerTool::VCCLCompilerTool()
CompileAsWinRT(unset), CompileAsWinRT(unset),
CompileOnly(unset), CompileOnly(unset),
DebugInformationFormat(debugDisabled), DebugInformationFormat(debugDisabled),
DefaultCharIsUnsigned(unset),
Detect64BitPortabilityProblems(unset), Detect64BitPortabilityProblems(unset),
DisableLanguageExtensions(unset), DisableLanguageExtensions(unset),
EnableEnhancedInstructionSet(archNotSet), EnableEnhancedInstructionSet(archNotSet),
@ -668,7 +666,7 @@ bool VCCLCompilerTool::parseOption(const char* option)
AdditionalIncludeDirectories += option+2; AdditionalIncludeDirectories += option+2;
break; break;
case 'J': case 'J':
DefaultCharIsUnsigned = _True; AdditionalOptions += option;
break; break;
case 'L': case 'L':
if(second == 'D') { if(second == 'D') {
@ -2646,7 +2644,6 @@ void VCProjectWriter::write(XmlOutput &xml, const VCCLCompilerTool &tool)
<< attrE(_CompileAsManaged, tool.CompileAsManaged, /*ifNot*/ managedDefault) << attrE(_CompileAsManaged, tool.CompileAsManaged, /*ifNot*/ managedDefault)
<< attrT(_CompileOnly, tool.CompileOnly) << attrT(_CompileOnly, tool.CompileOnly)
<< attrE(_DebugInformationFormat, tool.DebugInformationFormat, /*ifNot*/ debugUnknown) << attrE(_DebugInformationFormat, tool.DebugInformationFormat, /*ifNot*/ debugUnknown)
<< attrT(_DefaultCharIsUnsigned, tool.DefaultCharIsUnsigned)
<< attrT(_Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems) << attrT(_Detect64BitPortabilityProblems, tool.Detect64BitPortabilityProblems)
<< attrT(_DisableLanguageExtensions, tool.DisableLanguageExtensions) << attrT(_DisableLanguageExtensions, tool.DisableLanguageExtensions)
<< attrX(_DisableSpecificWarnings, tool.DisableSpecificWarnings) << attrX(_DisableSpecificWarnings, tool.DisableSpecificWarnings)