diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-15 09:50:37 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-15 10:27:19 +0000 |
| commit | ddf59ad0d0cf6e81b8e7fa821f0466937bc143aa (patch) | |
| tree | ac43abf1276b1319548f8993d61c56338ac31972 | |
| parent | 714dddb0d7974cc770fbc13f6aafdcfc0023ac8d (diff) | |
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 <paul.lemire@kdab.com>
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dshaderdata.h | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3drenderer/items/quick3dshaderdataarray.h | 2 | ||||
| -rw-r--r-- | src/render/frontend/qshaderdata.h | 3 |
3 files changed, 7 insertions, 0 deletions
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<Qt3D::QShaderData*>) + #endif // QT3D_QSHADERDATA_H |