diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-10-16 14:33:25 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-10-20 14:10:11 +0000 |
| commit | f43bc7ade5a2c2e9542390e04a9e4fba01505539 (patch) | |
| tree | 0464cc7cdf74834d13e6152cd46c5bd6e52f7988 /qmake/Makefile.win32 | |
| parent | 5a2d0cf5feb73dd7ea542ad1c61f1e60c113052e (diff) | |
msvc2015: Align compiler flags with rest of Qt build
msvc-desktop.conf does disable the exception warning for building all
modules, so use the same set of compiler flags for building qmake.
Change-Id: I97026f3cb78e656e8de76e1c8afe19cec6501499
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index c673899f18..e61e9503f3 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -22,7 +22,7 @@ CFLAGS_EXTRA = /Zc:wchar_t- ! elseif "$(QMAKESPEC)" == "win32-msvc2008" || "$(QMAKESPEC)" == "win32-msvc2010" || "$(QMAKESPEC)" == "win32-msvc2012" || "$(QMAKESPEC)" == "win32-msvc2013" CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS $(CFLAGS_CRT) ! elseif "$(QMAKESPEC)" == "win32-msvc2015" -CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /Zc:strictStrings /w44456 /w44457 /w44458 $(CFLAGS_CRT) +CFLAGS_EXTRA = /MP /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /Zc:strictStrings /w44456 /w44457 /w44458 /wd4577 $(CFLAGS_CRT) ! else ! error Unsupported compiler for this Makefile ! endif |