diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
| commit | 6bc1ce9c164d0230508eafbe6c18144c8b1a6a74 (patch) | |
| tree | e1e0fe8e15eb3b7ebfd90da9aeef0780f75c9700 /qmake | |
| parent | ccca3ffdc26f585f28ce0a8539f96f02adce30dc (diff) | |
| parent | 3890988bb69c2a50d4ebdbcd8c4c7058ac364125 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/corelib/kernel/qcfsocketnotifier.cpp
src/tools/qdoc/qdocindexfiles.cpp
Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a
Diffstat (limited to 'qmake')
| -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 11e93e54c2..339dae953a 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -922,6 +922,8 @@ bool VCCLCompilerTool::parseOption(const char* option) 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; } else { |