diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index b2dfb9e0bf2..dd023c9d20e 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -955,7 +955,7 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ }; // NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class -static const struct : QMetaTypeModuleHelper +static constexpr struct : QMetaTypeModuleHelper { template, QLatin1StringView, const char *>> diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 1b60c7c9d6c..fe72e7782fe 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE namespace { // NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class -static const struct : QMetaTypeModuleHelper +static constexpr struct : QMetaTypeModuleHelper { #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \ QT_METATYPE_INTERFACE_INIT(RealName), diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 459f95c0fb8..17a19aa780d 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE namespace { // NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class -static const struct : QMetaTypeModuleHelper +static constexpr struct : QMetaTypeModuleHelper { const QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override { switch (type) {