From 4b4d384f3e8e7e762faf033ad2585e45a5a70514 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 31 May 2023 19:14:30 -0700 Subject: [PATCH] Moc: remove GCC 9 ban for using QtMocHelpers::stringData() Whatever issue used to be present in the CI no longer is. That doesn't mean the problem went away; Ubuntu 20.04 is probably still shipping a broken compiler with bad codegen, but this isn't the first issue. Change-Id: I9201d9ecf52f4146bb04fffd1764673c94ee8955 Reviewed-by: Fabian Kosmale --- src/corelib/kernel/qtmochelpers.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/corelib/kernel/qtmochelpers.h b/src/corelib/kernel/qtmochelpers.h index 9e905ace20c..9d75177645e 100644 --- a/src/corelib/kernel/qtmochelpers.h +++ b/src/corelib/kernel/qtmochelpers.h @@ -76,10 +76,7 @@ template constexpr auto stringData(const char (&...strings)[Nx]) return result; } -#if !defined(Q_CC_GNU_ONLY) || Q_CC_GNU_ONLY >= 1000 -// It looks like there's a bug in GCC 9 # define QT_MOC_HAS_STRINGDATA 1 -#endif } // namespace QtMocHelpers QT_END_NAMESPACE