diff options
| author | Marc Mutz <[email protected]> | 2024-01-18 09:06:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-01-19 04:17:55 +0000 |
| commit | 8876639a43db52a2517d4fad1e53b5327e505389 (patch) | |
| tree | 1cd9ff150f91f8cd1921154be8cb03adc4b4cc22 | |
| parent | 0b222bbbeab2bad94ae438d729d8fea91e038d6e (diff) | |
QMetaTypeModuleHelper: suppress cppcoreguidelines-virtual-class-destructor
Says clang-tidy:
destructor of '(unnamed struct at qmetatype.cpp:966:14)' is public and non-virtual
in file:src/corelib/kernel/qmetatype.cpp line:966 col:14
static const struct : QMetaTypeModuleHelper
Yes, these classes are polymorphic (because the base class is). Yes,
the destructor is non-virtual (because the base class' one isn't, but
it's also protected, so fine).
But these classes are not used as base classes, so suppress the
warning.
Pick-to: 6.2
Change-Id: I75be86bca36a4a0e93d72acb1a0d2fe0dca1c505
Reviewed-by: Fabian Kosmale <[email protected]>
(cherry picked from commit 11d153ae1ce3ce75e76a1fcac7bf99e4cff05716)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 256ac3994395e308337b5c6ef03a8191ae3690fc)
(cherry picked from commit be6480834246f502a74cca8cbe69b06878497a1a)
| -rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qguivariant.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 0985db8e335..74b8e8bfcab 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -954,6 +954,7 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ {nullptr, 0, QMetaType::UnknownType} }; +// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class static const struct : QMetaTypeModuleHelper { template<typename T, typename LiteralWrapper = diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 8f57eb1830b..94eb5eb1187 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -56,6 +56,7 @@ QT_BEGIN_NAMESPACE namespace { +// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class static const struct : QMetaTypeModuleHelper { #define QT_IMPL_METATYPEINTERFACE_GUI_TYPES(MetaTypeName, MetaTypeId, RealName) \ diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index dd76d5c936a..bac17638430 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -12,6 +12,7 @@ QT_BEGIN_NAMESPACE namespace { +// NOLINTNEXTLINE(cppcoreguidelines-virtual-class-destructor): this is not a base class static const struct : QMetaTypeModuleHelper { const QtPrivate::QMetaTypeInterface *interfaceForType(int type) const override { |