diff options
| author | Marc Mutz <[email protected]> | 2024-01-18 09:11:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-01-19 23:48:35 +0000 |
| commit | 0e3e42a7d1594ea97482cac77bc1f660b7fb0552 (patch) | |
| tree | cc3c9a352d131f8c39a086fb173eb5f9a1eef083 | |
| parent | 85edeb1a17686626a6d8c6c27480d3a19a9d8e7c (diff) | |
QMetaTypeModuleHelper: mark instances constexpr
Static and thread-local objects should be constexpr or constinit if possible.
Task-number: QTBUG-100485
Change-Id: I29088798a50d6278252c9088e7c191c4214b2e5b
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit 88c3cd6e08c86bfb5bb676ceed4c92344f8ed91c)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 7b5df411db438cf6f0e26212e33f1f804e6da9f8)
(cherry picked from commit 652ee1562f485012ea7e780fabe9dde58da2fe52)
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 74b8e8bfcab..aff8f2e7586 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<typename T, typename LiteralWrapper = std::conditional_t<std::is_same_v<T, QString>, QLatin1StringView, const char *>> diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 94eb5eb1187..d2467fc552a 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 bac17638430..813c9bb6310 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) { |