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/templates/qquicktoolbar_p.h | |
| 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/templates/qquicktoolbar_p.h')
| -rw-r--r-- | src/templates/qquicktoolbar_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/templates/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h index 065f1f71..501f74c7 100644 --- a/src/templates/qquicktoolbar_p.h +++ b/src/templates/qquicktoolbar_p.h @@ -65,8 +65,8 @@ protected: #endif }; -Q_DECLARE_TYPEINFO(QQuickToolBar, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickToolBar) + #endif // QQUICKTOOLBAR_P_H |