diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-19 21:58:32 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 16:08:52 +0000 |
| commit | fc78bc2c06a5cb01f0a67675dbba1a5f0f99f5ed (patch) | |
| tree | 9e87bd6a9eb3e76b1a86ec9b66321afcb570a769 /src/gui/math3d | |
| parent | 4d0672ed42b802b2705ebc33493fb980bd5da3ab (diff) | |
QGenericMatrix<N,M,T>: mark as relocatable, depending on T
Inherit the type-classification from the underlying type,
but, for BC reasons, force isStatic = true, so QList does
not change its memory layout in an incompatible way.
Change-Id: I11003cdd24968f903fbd86aa2f5c17287e057c1f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index b7a6196515..5e22fa6730 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -103,6 +103,17 @@ private: friend class QGenericMatrix; #endif }; +template <int N, int M, typename T> +class QTypeInfo<QGenericMatrix<N, M, T> > + : public QTypeInfoMerger<QGenericMatrix<N, M, T>, T> +{ +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) +public: + enum { + isStatic = true, + }; // at least Q_RELOCATABLE_TYPE, for BC during Qt 5 +#endif +}; template <int N, int M, typename T> Q_INLINE_TEMPLATE QGenericMatrix<N, M, T>::QGenericMatrix() |