From a73fdd155568ad80938e539c882f45b4f5db4f9e Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Tue, 10 May 2022 13:05:25 +0300 Subject: INTEGRITY: enable C99 globally MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PCRE 10.40 requires C99 now. While all GHS compiler versions we support in Qt 6 default to C99, GHS v2016.5.4, which we use in Qt 5.15, still defaults to C89, so set QMAKE_CFLAGS_C99 for that compiler. It doesn't hurt in Qt 6, but enables the updated PCRE in Qt 5.15. Pick-to: 6.3 6.2 5.15 Change-Id: I0a2d3254f80136210289a415ede7c2409b07af9b Reviewed-by: Marc Mutz Reviewed-by: Jörg Bornemann Reviewed-by: Kimmo Ollila --- mkspecs/common/ghs-base.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'mkspecs') diff --git a/mkspecs/common/ghs-base.conf b/mkspecs/common/ghs-base.conf index eba9680349..3fd4cf70a7 100644 --- a/mkspecs/common/ghs-base.conf +++ b/mkspecs/common/ghs-base.conf @@ -29,6 +29,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS +QMAKE_CFLAGS_C99 = -std=c99 QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage QMAKE_CXXFLAGS_EXCEPTIONS_ON += --exceptions -- cgit v1.2.3