diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-11-03 19:01:28 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-11-11 07:44:26 -0700 |
| commit | e76bcaa203a0b6845c84ed9bb4cf11c2f6396f54 (patch) | |
| tree | 9d2eba87246bf1e62389324fb0361fe54f7d6148 /src/corelib/text/qlocale.cpp | |
| parent | 52dcd47850138ac257e3ad7e6eeae205bcff4aa6 (diff) | |
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 <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale.cpp')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 0ab9a57e0a..3e92da9596 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 |