diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-05-22 15:47:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-05-23 06:55:17 +0000 |
| commit | 39c835b9c5e4f13090e33f4713bba06f19f0bdeb (patch) | |
| tree | 700a90ee4323d176be1f2b914a2adef0cd47ca73 /qmake | |
| parent | 3dd089c08b8faaecf51991f27b0360ceb7c6e1b1 (diff) | |
Do not warn about unknown MSVC compiler conformance options
Every /Zc:XXX option qmake doesn't know about yields a "WARNING: Could
not parse Compiler option '-Zc:XXX'; added to AdditionalOptions."
Put all /Zc:XXX options we don't handle into AdditionalOptions without
printing a warning. There's no point in making all options known to
qmake and updating them for every MSVC release.
Change-Id: I319e027791a7b0a29d139ee3074ab1aed8ce8a63
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 1093d9849e..9aa73c084c 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -950,12 +950,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 if (config->CompilerVersion >= NET2015 && strncmp(option + 4, "throwingNew", 11) == 0) - AdditionalOptions += option; else - found = false; + AdditionalOptions += option; } else { found = false; break; } |