From e76bcaa203a0b6845c84ed9bb4cf11c2f6396f54 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 3 Nov 2022 19:01:28 -0700 Subject: [PATCH] QLocale: update the disabling of -Wfree-nonheap-object to GCC 10 only Testing with 11 and 12 does not produce the warning. Change-Id: I3d74c753055744deb8acfffd17243f3bd60e6855 Reviewed-by: Edward Welbourne --- src/corelib/text/qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 0ab9a57e0a2..3e92da95963 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -4,7 +4,7 @@ #include "qglobal.h" -#if (defined(QT_STATIC) || defined(QT_BOOTSTRAPPED)) && defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1000 +#if (defined(QT_STATIC) || defined(QT_BOOTSTRAPPED)) && defined(Q_CC_GNU_ONLY) && Q_CC_GNU && __GNUC__ == 10 QT_WARNING_DISABLE_GCC("-Wfree-nonheap-object") // false positive tracking #endif