From ddf59ad0d0cf6e81b8e7fa821f0466937bc143aa Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 15 Jun 2015 09:50:37 +0100 Subject: Fix crash on windows Q_DECLARE_METATYPE() is required, even for QObject subclass pointers, if you want to be able to call qMetaTypeId() for that type. Task-number: QTBUG-46661 Change-Id: Iaabf758f1d3b92569a463d2a5fb13389f086bd5c Reviewed-by: Paul Lemire --- src/quick3d/quick3drenderer/items/quick3dshaderdata.h | 2 ++ src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h | 2 ++ src/render/frontend/qshaderdata.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h index 65b635fe7..56bd143f9 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.h @@ -69,4 +69,6 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderData*) + #endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATA_H diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h index e5ca26bf0..7e663fbb9 100644 --- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h +++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h @@ -85,4 +85,6 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(Qt3D::Render::Quick::Quick3DShaderDataArray*) + #endif // QT3D_RENDER_QUICK_QUICK3DSHADERDATAARRAY_H diff --git a/src/render/frontend/qshaderdata.h b/src/render/frontend/qshaderdata.h index 577d4fd79..b38409cfb 100644 --- a/src/render/frontend/qshaderdata.h +++ b/src/render/frontend/qshaderdata.h @@ -83,4 +83,7 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(Qt3D::QShaderData*) +Q_DECLARE_METATYPE(QList) + #endif // QT3D_QSHADERDATA_H -- cgit v1.2.3