From bf2bff543c20f46271152c8eeddc0050bb61c143 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 5 Apr 2022 15:41:51 +0200 Subject: [PATCH] QMetaTypeModuleHelper: prevent slicing Disable copy and move SMFs and make the dtor protected. This requires to restore the default ctor, which in turn also becomes protected, because it needn't be public. Found by clazy-copyable-polymorphic. Pick-to: 6.3 Change-Id: Ibde8202e755f6de05cd8f9e92cf0f9cf19b4e19b Reviewed-by: Thiago Macieira --- src/corelib/kernel/qmetatype_p.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 0f1bd5d7050..3dd1f535896 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -76,6 +76,10 @@ QT_BEGIN_NAMESPACE class QMetaTypeModuleHelper { + Q_DISABLE_COPY_MOVE(QMetaTypeModuleHelper) +protected: + QMetaTypeModuleHelper() = default; + ~QMetaTypeModuleHelper() = default; public: static constexpr auto makePair(int from, int to) -> quint64 {