From a75e7c4c1fd34abb9086fd0b3d5943e0c6987659 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sun, 20 Dec 2015 19:58:55 +0100 Subject: Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T) Q_COMPLEX_TYPE tells Qt containers that the type has a ctor/dtor and that it may not be moved in memory using memcpy(). QML types are never stored by value in Qt containers (non-copyable QObjects), so the type info declaration is superfluous. QML_DECLARE_TYPE, however, is useful (QTBUG-49920) and consistently used for all QtQuick types. Change-Id: I3bd1718b306fa7af85a623fa7a17e1b9653d2152 Reviewed-by: Mitch Curtis --- src/imports/controls/material/qquickmaterialprogressring_p.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/material/qquickmaterialprogressring_p.h') diff --git a/src/imports/controls/material/qquickmaterialprogressring_p.h b/src/imports/controls/material/qquickmaterialprogressring_p.h index 17845a66..6f4ebc6b 100644 --- a/src/imports/controls/material/qquickmaterialprogressring_p.h +++ b/src/imports/controls/material/qquickmaterialprogressring_p.h @@ -86,9 +86,8 @@ protected: QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickMaterialProgressRing, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickMaterialRingAnimator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickMaterialProgressRing) + #endif // QQUICKMATERIALPROGRESSRING_P_H -- cgit v1.2.3