From dda4ee46f9ba3007981383a08ac6d73940b48905 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 19 Jul 2015 21:54:37 +0200 Subject: [PATCH] QVectorND: mark as primitive, not just movable Every bit combination is a valid object, so the correct type classification is primitive, not just movable. This is BC, because it just changes whether the default ctor and dtor are run or not, and these types don't care. Change-Id: Ifbfa83128778744f15a086a65c8be1ce01a58820 Reviewed-by: Sean Harmer --- src/gui/math3d/qvector2d.h | 2 +- src/gui/math3d/qvector3d.h | 2 +- src/gui/math3d/qvector4d.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 137142f3818..c4e62710d9a 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -122,7 +122,7 @@ private: friend class QVector4D; }; -Q_DECLARE_TYPEINFO(QVector2D, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVector2D, Q_PRIMITIVE_TYPE); Q_DECL_CONSTEXPR inline QVector2D::QVector2D() : xp(0.0f), yp(0.0f) {} diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 5be637e0c58..b62d33da71e 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -141,7 +141,7 @@ private: #endif }; -Q_DECLARE_TYPEINFO(QVector3D, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVector3D, Q_PRIMITIVE_TYPE); Q_DECL_CONSTEXPR inline QVector3D::QVector3D() : xp(0.0f), yp(0.0f), zp(0.0f) {} diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index 72db8ac7548..0543f0fbe39 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -131,7 +131,7 @@ private: #endif }; -Q_DECLARE_TYPEINFO(QVector4D, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVector4D, Q_PRIMITIVE_TYPE); Q_DECL_CONSTEXPR inline QVector4D::QVector4D() : xp(0.0f), yp(0.0f), zp(0.0f), wp(0.0f) {}