diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-09 07:06:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-09 07:06:52 +0000 |
| commit | 5bfac9d653357c906946563b9494d7ae69cdad92 (patch) | |
| tree | 0cc119af894a398497eba6f56fe2f224f6947616 /mkspecs/common | |
| parent | f08e1ecdc88e9373a31c1505d5db7f905431c644 (diff) | |
| parent | 77da617dc8e378a631ee8c15b1b414f16b87f147 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index e1abca46e4..72e0b98c9c 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -141,7 +141,7 @@ greaterThan(MSC_VER, 1899) { QMAKE_CFLAGS_WARN_ON += -w44456 -w44457 -w44458 QMAKE_CFLAGS_AVX2 = -arch:AVX2 QMAKE_CXXFLAGS += -Zc:strictStrings - QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 + QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 } unset(MSC_VER) |