From 9ddfa43e023f06387eb3360cc2e15bfff68ffe5f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 12 Jan 2015 16:05:00 +0100 Subject: MSVC: Remove use of -Zm argument We've been setting the -Zm argument since the dawn of times (even before the first git commit). Anyhow, MSDN from VS2008 onwards indicates that this is not needed: "In earlier versions of Visual C++, the compiler used several discrete heaps, and each had a finite limit. Currently, the compiler dynamically grows the heaps as necessary up to a total heap size limit, and requires a fixed-size buffer only to construct precompiled headers. Consequently, the /Zm compiler option is rarely necessary." [ChangeLog][Compiler Specific Changes] Visual Studio: -Zm200 (an option to specify the precompiled header memory allocation limit) is not added anymore by qmake to the compiler calls. If you encounter an C1076 compiler error you might need to re-add it in your .pro file. Change-Id: Ia4bec7eba09d893a7d81886a1814602b9ce7563c Reviewed-by: Friedemann Kleint --- examples/widgets/graphicsview/boxes/boxes.pro | 7 ------- examples/widgets/painting/composition/composition.pro | 6 ------ mkspecs/common/msvc-desktop.conf | 2 +- mkspecs/common/winrt_winphone/qmake.conf | 2 +- tests/auto/gui/image/qimagereader/qimagereader.pro | 5 ----- tests/auto/gui/image/qimagewriter/qimagewriter.pro | 2 -- tools/configure/Makefile.win32 | 2 +- 7 files changed, 3 insertions(+), 23 deletions(-) diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 93621878f1..e608b1c845 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -32,10 +32,3 @@ INSTALLS += target wince*: { DEPLOYMENT_PLUGIN += qjpeg } - -win32-msvc* { - QMAKE_CXXFLAGS -= -Zm200 - QMAKE_CFLAGS -= -Zm200 - QMAKE_CXXFLAGS += -Zm500 - QMAKE_CFLAGS += -Zm500 -} diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index 332291c2a4..3b64714ba2 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/examples/widgets/painting/composition/composition.pro @@ -16,12 +16,6 @@ QT += widgets target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition INSTALLS += target - -win32-msvc* { - QMAKE_CXXFLAGS += /Zm500 - QMAKE_CFLAGS += /Zm500 -} - wince* { DEPLOYMENT_PLUGIN += qjpeg } diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index 3aab11a130..e16938b7b8 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -25,7 +25,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t +QMAKE_CFLAGS = -nologo -Zc:wchar_t QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 0c59d0307c..70bd0a3945 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -18,7 +18,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O2 -MD diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro index 76fb4d8bfc..2ab06abe83 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.pro +++ b/tests/auto/gui/image/qimagereader/qimagereader.pro @@ -9,9 +9,4 @@ android: !android-no-sdk { RESOURCES += android_testdata.qrc } -win32-msvc:QMAKE_CXXFLAGS -= -Zm200 -win32-msvc:QMAKE_CXXFLAGS += -Zm800 -win32-msvc.net:QMAKE_CXXFLAGS -= -Zm300 -win32-msvc.net:QMAKE_CXXFLAGS += -Zm1100 - TESTDATA += images/* baseline/* diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro index ce6707ec92..31184bffdb 100644 --- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro +++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro @@ -3,7 +3,5 @@ TARGET = tst_qimagewriter QT += testlib SOURCES += tst_qimagewriter.cpp MOC_DIR=tmp -win32-msvc:QMAKE_CXXFLAGS -= -Zm200 -win32-msvc:QMAKE_CXXFLAGS += -Zm800 android:!android-no-sdk:RESOURCES+= qimagewriter.qrc TESTDATA += images/* diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index 3fe04eef66..b74b0bc82d 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -5,7 +5,7 @@ CONFSRC = $(TOOLSRC)\configure PCH = configure_pch.pch DEFINES = -DUNICODE -DQT_NO_CODECS -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_COMPRESS -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -D_CRT_SECURE_NO_DEPRECATE -DQT_BOOTSTRAPPED -DQT_BUILD_CONFIGURE -DCOMMERCIAL_VERSION INCPATH = -I"..\..\include" -I"..\..\include\QtCore" -I"..\..\include\QtCore\$(QTVERSION)" -I"..\..\include\QtCore\$(QTVERSION)\QtCore" -I"$(TOOLSRC)\shared" -I"$(QTSRC)mkspecs\win32-msvc2008" -CXXFLAGS_BARE = -nologo -Zm200 -Zc:wchar_t -W3 -GR -EHsc -w34100 -w34189 $(CFLAGS_CRT) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCPATH) +CXXFLAGS_BARE = -nologo -Zc:wchar_t -W3 -GR -EHsc -w34100 -w34189 $(CFLAGS_CRT) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCPATH) CXXFLAGS = -FIconfigure_pch.h -Yuconfigure_pch.h -Fp$(PCH) -MP $(CXXFLAGS_BARE) LINK = link LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest" -- cgit v1.2.3