diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /qmake/generators | |
parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 993e1fa4f4..0d1a294b28 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; } @@ -1155,7 +1151,7 @@ bool VCCLCompilerTool::parseOption(const char* option) case 'u': if (!second) UndefineAllPreprocessorDefinitions = _True; - else if (second == 't' && third == 'f' && fourth == '8') + else if (strcmp(option + 2, "tf-8") == 0) AdditionalOptions += option; else found = false; |