summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-06-15 09:50:37 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-06-15 10:27:19 +0000
commitddf59ad0d0cf6e81b8e7fa821f0466937bc143aa (patch)
treeac43abf1276b1319548f8993d61c56338ac31972 /src/render
parent714dddb0d7974cc770fbc13f6aafdcfc0023ac8d (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>
Diffstat (limited to 'src/render')
-rw-r--r--src/render/frontend/qshaderdata.h3
1 files changed, 3 insertions, 0 deletions
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