diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-20 19:58:55 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-21 12:43:27 +0000 |
| commit | a75e7c4c1fd34abb9086fd0b3d5943e0c6987659 (patch) | |
| tree | b66422117bdc5a3795d33083eadf6fbd1c74d8b6 /src/imports/controls | |
| parent | 1797cbcd839b1bbcd09a6549e787b5211a7d1a3e (diff) | |
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 <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
6 files changed, 9 insertions, 17 deletions
diff --git a/src/imports/controls/material/qquickmaterialprogressring.cpp b/src/imports/controls/material/qquickmaterialprogressring.cpp index 9953266d..7f7ed114 100644 --- a/src/imports/controls/material/qquickmaterialprogressring.cpp +++ b/src/imports/controls/material/qquickmaterialprogressring.cpp @@ -274,7 +274,4 @@ void QQuickMaterialRingTexture::setColor(QColor color) m_color = color; } -Q_DECLARE_TYPEINFO(QQuickMaterialRingAnimatorJob, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickMaterialRingTexture, Q_COMPLEX_TYPE); - QT_END_NAMESPACE 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 diff --git a/src/imports/controls/qquickbusyindicatorring_p.h b/src/imports/controls/qquickbusyindicatorring_p.h index 24342349..4697628d 100644 --- a/src/imports/controls/qquickbusyindicatorring_p.h +++ b/src/imports/controls/qquickbusyindicatorring_p.h @@ -75,9 +75,8 @@ protected: QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickBusyIndicatorRing, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickBusyIndicatorAnimator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickBusyIndicatorRing) + #endif // QQUICKBUSYINDICATOR_P_H diff --git a/src/imports/controls/universal/qquickuniversalimageprovider_p.h b/src/imports/controls/universal/qquickuniversalimageprovider_p.h index 374d842d..15648157 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider_p.h +++ b/src/imports/controls/universal/qquickuniversalimageprovider_p.h @@ -60,8 +60,6 @@ public: QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickUniversalImageProvider, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKUNIVERSALIMAGEPROVIDER_P_H diff --git a/src/imports/controls/universal/qquickuniversalprogressring_p.h b/src/imports/controls/universal/qquickuniversalprogressring_p.h index f8ed212c..1d484e3a 100644 --- a/src/imports/controls/universal/qquickuniversalprogressring_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressring_p.h @@ -92,9 +92,8 @@ protected: QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickUniversalProgressRing, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickUniversalProgressRingAnimator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickUniversalProgressRing) + #endif // QQUICKUNIVERSALPROGRESSRING_P_H diff --git a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h index f7c063b6..b61e73c6 100644 --- a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h @@ -86,9 +86,9 @@ protected: QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickUniversalProgressStrip, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickUniversalProgressStripAnimator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickUniversalProgressStrip) +QML_DECLARE_TYPE(QQuickUniversalProgressStripAnimator) + #endif // QQUICKUNIVERSALPROGRESSSTRIP_P_H |