diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-03-20 14:53:51 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-03-20 15:46:45 (GMT) |
| commit | ab3c64522b8ebf51727c7721c361524fa509f630 (patch) | |
| tree | a5a2272b7ad982cbb3fefd3568715afcc1f98563 /qmake/generators | |
| parent | c0b2c4e88edab204391089ac71ad0cec0a1444c6 (diff) | |
| download | Qt-ab3c64522b8ebf51727c7721c361524fa509f630.zip Qt-ab3c64522b8ebf51727c7721c361524fa509f630.tar.gz Qt-ab3c64522b8ebf51727c7721c361524fa509f630.tar.bz2 | |
fix qmake warning about unknown /Zc:strictStrings option
Make /Zc:strictStrings known to qmake's MSVC compiler option parser.
Change-Id: I5a4494096fc1d67c96c6de52bb0f1e94eff46136
(cherry picked from commit qtbase/55f88e6e310ceb99bef31ed8d884deaa55c78d91)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 9d3bcee..bbe02a9 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -909,6 +909,8 @@ bool VCCLCompilerTool::parseOption(const char* option) ForceConformanceInForLoopScope = ((*c) == '-' ? _False : _True); else if(fourth == 'w') TreatWChar_tAsBuiltInType = ((*c) == '-' ? _False : _True); + else if (config->CompilerVersion >= NET2013 && strncmp(option + 4, "strictStrings", 13) == 0) + AdditionalOptions += option; else found = false; } else { |