summaryrefslogtreecommitdiffstats
path: root/src/corelib/text
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-11-22 03:07:06 +0000
committerThiago Macieira <thiago.macieira@intel.com>2023-02-25 16:45:01 +0000
commit938dc34f94884466ab2f946b26fa3aff6025dd29 (patch)
tree0999f194ff1b7141d778a8e691710b24f33771de /src/corelib/text
parent06a2101e952fcf3baa4cdbcfda5c32cbb316bb34 (diff)
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 <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text')
-rw-r--r--src/corelib/text/qlocale.cpp2
1 files changed, 1 insertions, 1 deletions
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