From 938dc34f94884466ab2f946b26fa3aff6025dd29 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 22 Nov 2022 03:07:06 +0000 Subject: Revert "QLocale: update the disabling of -Wfree-nonheap-object to GCC 10 only" This reverts commit e76bcaa203a0b6845c84ed9bb4cf11c2f6396f54. I managed to reproduce the warning with GCC 12. It only happens with -flto (LTCG) builds, not in regular release builds. Change-Id: I6747273300ee51dec05563233017ba0cdf46794a Reviewed-by: Edward Welbourne --- src/corelib/text/qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/text') diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index fd4fc1ad3d..953956a4a9 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 && __GNUC__ == 10 +#if (defined(QT_STATIC) || defined(QT_BOOTSTRAPPED)) && defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1000 QT_WARNING_DISABLE_GCC("-Wfree-nonheap-object") // false positive tracking #endif -- cgit v1.2.3