summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-04-05 15:41:51 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-04-06 12:44:40 +0200
commitbf2bff543c20f46271152c8eeddc0050bb61c143 (patch)
treeeea02abb94decb98429472fce3d6be8d3bfa26c3
parenta322af7df434a367d560a3cbdc0b53e314477056 (diff)
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 <thiago.macieira@intel.com>
-rw-r--r--src/corelib/kernel/qmetatype_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h
index 0f1bd5d705..3dd1f53589 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
{