1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix parsing of the /utf8 MSVC compiler flag in VS project generator

Browse Source 
Adding the /utf8 compiler flag resulted in undefining all preprocessor
symbols for VS project files, because the ingenious compiler option
parsing logic checked for a 'u' prefix, and "utf8" obviously matched.

The /utf8 flag is added to the additional options, because there doesn't
seem to be an XML tag for that.

Task-number: QTBUG-59431
Change-Id: I762fcdcf6caf0606b40633861e265df5edb4a9c4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Joerg Bornemann 2017-03-13 13:24:48 +01:00
parent 16d1ddfc42
commit 70e772079f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1153,7 +1153,12 @@ bool VCCLCompilerTool::parseOption(const char* option)
} }
found = false; break; found = false; break;
case 'u': case 'u':
UndefineAllPreprocessorDefinitions = _True; if (!second)
UndefineAllPreprocessorDefinitions = _True;
else if (second == 't' && third == 'f' && fourth == '8')
AdditionalOptions += option;
else
found = false;
break; break;
case 'v': case 'v':
if(second == 'd' || second == 'm') { if(second == 'd' || second == 'm') {