diff options
63 files changed, 103 insertions, 142 deletions
diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/controls/qquickpaddedrectangle_p.h index 3ebb75b8..5c0a8919 100644 --- a/src/controls/qquickpaddedrectangle_p.h +++ b/src/controls/qquickpaddedrectangle_p.h @@ -111,8 +111,8 @@ private: bool m_hasBottomPadding; }; -Q_DECLARE_TYPEINFO(QQuickPaddedRectangle, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickPaddedRectangle) + #endif // QQUICKPADDEDRECTANGLE_P_H diff --git a/src/imports/calendar/qquickcalendar_p.h b/src/imports/calendar/qquickcalendar_p.h index 569be1d6..c44a6a1c 100644 --- a/src/imports/calendar/qquickcalendar_p.h +++ b/src/imports/calendar/qquickcalendar_p.h @@ -50,6 +50,7 @@ #include <QtCore/qobject.h> #include <QtCore/qdatetime.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -77,8 +78,8 @@ public: Q_ENUM(Month) }; -Q_DECLARE_TYPEINFO(QQuickCalendar, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickCalendar) + #endif // QQUICKCALENDAR_P_H diff --git a/src/imports/calendar/qquickcalendarmodel_p.h b/src/imports/calendar/qquickcalendarmodel_p.h index f46dcc4c..4f17980a 100644 --- a/src/imports/calendar/qquickcalendarmodel_p.h +++ b/src/imports/calendar/qquickcalendarmodel_p.h @@ -51,6 +51,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdatetime.h> #include <QtQml/qqmlparserstatus.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -101,8 +102,8 @@ private: Q_DECLARE_PRIVATE(QQuickCalendarModel) }; -Q_DECLARE_TYPEINFO(QQuickCalendarModel, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickCalendarModel) + #endif // QQUICKCALENDARMODEL_P_H diff --git a/src/imports/calendar/qquickdayofweekmodel_p.h b/src/imports/calendar/qquickdayofweekmodel_p.h index 87e04695..90ebdc6c 100644 --- a/src/imports/calendar/qquickdayofweekmodel_p.h +++ b/src/imports/calendar/qquickdayofweekmodel_p.h @@ -50,6 +50,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -88,8 +89,8 @@ private: Q_DECLARE_PRIVATE(QQuickDayOfWeekModel) }; -Q_DECLARE_TYPEINFO(QQuickDayOfWeekModel, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickDayOfWeekModel) + #endif // QQUICKDAYOFWEEKMODEL_P_H diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index 93916765..d1e5e16f 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -85,8 +85,8 @@ private: Q_DECLARE_PRIVATE(QQuickDayOfWeekRow) }; -Q_DECLARE_TYPEINFO(QQuickDayOfWeekRow, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickDayOfWeekRow) + #endif // QQUICKDAYOFWEEKROW_P_H diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index 47be2f7c..b2d8124a 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -112,8 +112,8 @@ private: Q_DECLARE_PRIVATE(QQuickMonthGrid) }; -Q_DECLARE_TYPEINFO(QQuickMonthGrid, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickMonthGrid) + #endif // QQUICKMONTHGRID_P_H diff --git a/src/imports/calendar/qquickmonthmodel_p.h b/src/imports/calendar/qquickmonthmodel_p.h index 6d79de9a..0f8347b5 100644 --- a/src/imports/calendar/qquickmonthmodel_p.h +++ b/src/imports/calendar/qquickmonthmodel_p.h @@ -51,6 +51,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdatetime.h> #include <QtCore/qlocale.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -107,8 +108,8 @@ private: Q_DECLARE_PRIVATE(QQuickMonthModel) }; -Q_DECLARE_TYPEINFO(QQuickMonthModel, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickMonthModel) + #endif // QQUICKMONTHMODEL_P_H diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index c1ebfbd7..2cacdeac 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -95,8 +95,8 @@ private: Q_DECLARE_PRIVATE(QQuickWeekNumberColumn) }; -Q_DECLARE_TYPEINFO(QQuickWeekNumberColumn, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickWeekNumberColumn) + #endif // QQUICKWEEKNUMBERCOLUMN_P_H diff --git a/src/imports/calendar/qquickweeknumbermodel_p.h b/src/imports/calendar/qquickweeknumbermodel_p.h index 6b73bb36..2c8b484f 100644 --- a/src/imports/calendar/qquickweeknumbermodel_p.h +++ b/src/imports/calendar/qquickweeknumbermodel_p.h @@ -50,6 +50,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qlocale.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -96,8 +97,8 @@ private: Q_DECLARE_PRIVATE(QQuickWeekNumberModel) }; -Q_DECLARE_TYPEINFO(QQuickWeekNumberModel, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickWeekNumberModel) + #endif // QQUICKWEEKNUMBERMODEL_P_H 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 diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index 080b340b..e0296dc0 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -144,8 +144,8 @@ private: Q_DECLARE_PRIVATE(QQuickAbstractButton) }; -Q_DECLARE_TYPEINFO(QQuickAbstractButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickAbstractButton) + #endif // QQUICKABSTRACTBUTTON_P_H diff --git a/src/templates/qquickabstractbutton_p_p.h b/src/templates/qquickabstractbutton_p_p.h index ade0b6bf..601c6dc7 100644 --- a/src/templates/qquickabstractbutton_p_p.h +++ b/src/templates/qquickabstractbutton_p_p.h @@ -90,8 +90,6 @@ public: QQuickButtonGroup *group; }; -Q_DECLARE_TYPEINFO(QQuickAbstractButtonPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKABSTRACTBUTTON_P_P_H diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index 0218b3c7..a2069cd8 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -145,11 +145,9 @@ private: Q_DECLARE_PRIVATE(QQuickApplicationWindowAttached) }; -Q_DECLARE_TYPEINFO(QQuickApplicationWindow, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickApplicationWindowAttached, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickApplicationWindow) QML_DECLARE_TYPEINFO(QQuickApplicationWindow, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKAPPLICATIONWINDOW_P_H diff --git a/src/templates/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h index 0a5defbc..8be19d5c 100644 --- a/src/templates/qquickbusyindicator_p.h +++ b/src/templates/qquickbusyindicator_p.h @@ -78,8 +78,8 @@ private: Q_DECLARE_PRIVATE(QQuickBusyIndicator) }; -Q_DECLARE_TYPEINFO(QQuickBusyIndicator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickBusyIndicator) + #endif // QQUICKBUSYINDICATOR_P_H diff --git a/src/templates/qquickbutton_p.h b/src/templates/qquickbutton_p.h index 3863566e..83d22fb8 100644 --- a/src/templates/qquickbutton_p.h +++ b/src/templates/qquickbutton_p.h @@ -63,8 +63,8 @@ protected: QFont defaultFont() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickButton) + #endif // QQUICKBUTTON_P_H diff --git a/src/templates/qquickbuttongroup_p.h b/src/templates/qquickbuttongroup_p.h index 366d2b2a..6210079d 100644 --- a/src/templates/qquickbuttongroup_p.h +++ b/src/templates/qquickbuttongroup_p.h @@ -108,10 +108,9 @@ private: Q_DECLARE_PRIVATE(QQuickButtonGroupAttached) }; -Q_DECLARE_TYPEINFO(QQuickButtonGroup, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickButtonGroup) QML_DECLARE_TYPEINFO(QQuickButtonGroup, QML_HAS_ATTACHED_PROPERTIES) #endif // QQuickButtonGroup_H diff --git a/src/templates/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h index 5cf97476..4c0d505f 100644 --- a/src/templates/qquickcheckbox_p.h +++ b/src/templates/qquickcheckbox_p.h @@ -88,8 +88,8 @@ private: Q_DECLARE_PRIVATE(QQuickCheckBox) }; -Q_DECLARE_TYPEINFO(QQuickCheckBox, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickCheckBox) + #endif // QQUICKCHECKBOX_P_H diff --git a/src/templates/qquickcombobox_p.h b/src/templates/qquickcombobox_p.h index 21d29714..da237c8e 100644 --- a/src/templates/qquickcombobox_p.h +++ b/src/templates/qquickcombobox_p.h @@ -139,8 +139,8 @@ private: Q_DECLARE_PRIVATE(QQuickComboBox) }; -Q_DECLARE_TYPEINFO(QQuickComboBox, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickComboBox) + #endif // QQUICKCOMBOBOX_P_H diff --git a/src/templates/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h index a77b285c..83476f66 100644 --- a/src/templates/qquickcontainer_p.h +++ b/src/templates/qquickcontainer_p.h @@ -109,8 +109,8 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_currentIndexChanged()) }; -Q_DECLARE_TYPEINFO(QQuickContainer, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickContainer) + #endif // QQUICKCONTAINER_P_H diff --git a/src/templates/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h index 2e5a36a1..6eb79c88 100644 --- a/src/templates/qquickcontainer_p_p.h +++ b/src/templates/qquickcontainer_p_p.h @@ -92,8 +92,6 @@ public: bool updatingCurrent; }; -Q_DECLARE_TYPEINFO(QQuickContainerPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKCONTAINER_P_P_H diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 8391a7ab..ea1180b1 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -178,8 +178,8 @@ private: Q_DECLARE_PRIVATE(QQuickControl) }; -Q_DECLARE_TYPEINFO(QQuickControl, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickControl) + #endif // QQUICKCONTROL_P_H diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index 79824545..fff36bc0 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -121,8 +121,6 @@ public: QQuickAccessibleAttached *accessibleAttached; }; -Q_DECLARE_TYPEINFO(QQuickControlPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKCONTROL_P_P_H diff --git a/src/templates/qquickdial_p.h b/src/templates/qquickdial_p.h index c4e7c276..19d37547 100644 --- a/src/templates/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -140,8 +140,8 @@ private: Q_DECLARE_PRIVATE(QQuickDial) }; -Q_DECLARE_TYPEINFO(QQuickDial, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickDial) + #endif // QQUICKDIAL_H diff --git a/src/templates/qquickdrawer_p.h b/src/templates/qquickdrawer_p.h index c05ad036..f953b0fd 100644 --- a/src/templates/qquickdrawer_p.h +++ b/src/templates/qquickdrawer_p.h @@ -107,8 +107,8 @@ private: Q_DECLARE_PRIVATE(QQuickDrawer) }; -Q_DECLARE_TYPEINFO(QQuickDrawer, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickDrawer) + #endif // QQUICKDRAWER_P_H diff --git a/src/templates/qquickframe_p.h b/src/templates/qquickframe_p.h index b59335ce..0bfd63e8 100644 --- a/src/templates/qquickframe_p.h +++ b/src/templates/qquickframe_p.h @@ -76,8 +76,8 @@ private: Q_DECLARE_PRIVATE(QQuickFrame) }; -Q_DECLARE_TYPEINFO(QQuickFrame, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickFrame) + #endif // QQUICKFRAME_P_H diff --git a/src/templates/qquickframe_p_p.h b/src/templates/qquickframe_p_p.h index 4186ff36..3d570572 100644 --- a/src/templates/qquickframe_p_p.h +++ b/src/templates/qquickframe_p_p.h @@ -64,8 +64,6 @@ public: QQuickItem *frame; }; -Q_DECLARE_TYPEINFO(QQuickFramePrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKFRAME_P_P_H diff --git a/src/templates/qquickgroupbox_p.h b/src/templates/qquickgroupbox_p.h index 5dcfe971..b81d6534 100644 --- a/src/templates/qquickgroupbox_p.h +++ b/src/templates/qquickgroupbox_p.h @@ -81,8 +81,8 @@ private: Q_DECLARE_PRIVATE(QQuickGroupBox) }; -Q_DECLARE_TYPEINFO(QQuickGroupBox, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickGroupBox) + #endif // QQUICKGROUPBOX_P_H diff --git a/src/templates/qquickitemdelegate_p.h b/src/templates/qquickitemdelegate_p.h index e3f415a6..01e7b39c 100644 --- a/src/templates/qquickitemdelegate_p.h +++ b/src/templates/qquickitemdelegate_p.h @@ -71,8 +71,8 @@ private: Q_DECLARE_PRIVATE(QQuickItemDelegate) }; -Q_DECLARE_TYPEINFO(QQuickItemDelegate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickItemDelegate) + #endif // QQUICKITEMDELEGATE_P_H diff --git a/src/templates/qquicklabel_p.h b/src/templates/qquicklabel_p.h index d753320d..26f72840 100644 --- a/src/templates/qquicklabel_p.h +++ b/src/templates/qquicklabel_p.h @@ -86,8 +86,8 @@ private: Q_DECLARE_PRIVATE(QQuickLabel) }; -Q_DECLARE_TYPEINFO(QQuickLabel, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickLabel) + #endif // QQUICKLABEL_P_H diff --git a/src/templates/qquicklabel_p_p.h b/src/templates/qquicklabel_p_p.h index 1cd831b1..a4e9f4e5 100644 --- a/src/templates/qquicklabel_p_p.h +++ b/src/templates/qquicklabel_p_p.h @@ -86,8 +86,6 @@ public: QQuickAccessibleAttached *accessibleAttached; }; -Q_DECLARE_TYPEINFO(QQuickLabelPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKLABEL_P_P_H diff --git a/src/templates/qquickmenu_p.h b/src/templates/qquickmenu_p.h index a9151fd7..d4bb27b9 100644 --- a/src/templates/qquickmenu_p.h +++ b/src/templates/qquickmenu_p.h @@ -49,6 +49,7 @@ // #include <QtQml/qqmllist.h> +#include <QtQml/qqml.h> #include "qquickpopup_p.h" @@ -84,8 +85,8 @@ private: Q_DECLARE_PRIVATE(QQuickMenu) }; -Q_DECLARE_TYPEINFO(QQuickMenu, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickMenu) + #endif // QQUICKMENU_P_H diff --git a/src/templates/qquickmenu_p_p.h b/src/templates/qquickmenu_p_p.h index a5e99f1c..154ba968 100644 --- a/src/templates/qquickmenu_p_p.h +++ b/src/templates/qquickmenu_p_p.h @@ -91,8 +91,6 @@ public: bool ignoreActiveFocusChanges; }; -Q_DECLARE_TYPEINFO(QQuickMenuPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKMENU_P_P_H diff --git a/src/templates/qquickmenuitem_p.h b/src/templates/qquickmenuitem_p.h index 5cc500e9..91d1e91e 100644 --- a/src/templates/qquickmenuitem_p.h +++ b/src/templates/qquickmenuitem_p.h @@ -76,8 +76,8 @@ private: Q_DECLARE_PRIVATE(QQuickMenuItem) }; -Q_DECLARE_TYPEINFO(QQuickMenuItem, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickMenuItem) + #endif // QQUICKMENUITEM_P_H diff --git a/src/templates/qquickoverlay_p.h b/src/templates/qquickoverlay_p.h index 8af1372b..a48b54ed 100644 --- a/src/templates/qquickoverlay_p.h +++ b/src/templates/qquickoverlay_p.h @@ -89,4 +89,6 @@ private: QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickOverlay) + #endif // QQUICKOVERLAY_P_H diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h index 46eb2cb2..487b4d6e 100644 --- a/src/templates/qquickpageindicator_p.h +++ b/src/templates/qquickpageindicator_p.h @@ -101,8 +101,8 @@ private: Q_DECLARE_PRIVATE(QQuickPageIndicator) }; -Q_DECLARE_TYPEINFO(QQuickPageIndicator, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickPageIndicator) + #endif // QQUICKPAGEINDICATOR_P_H diff --git a/src/templates/qquickpane_p.h b/src/templates/qquickpane_p.h index e42e10ef..e599f55f 100644 --- a/src/templates/qquickpane_p.h +++ b/src/templates/qquickpane_p.h @@ -95,8 +95,8 @@ private: Q_DECLARE_PRIVATE(QQuickPane) }; -Q_DECLARE_TYPEINFO(QQuickPane, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickPane) + #endif // QQUICKPANE_P_H diff --git a/src/templates/qquickpane_p_p.h b/src/templates/qquickpane_p_p.h index 3ff50042..477dc0bc 100644 --- a/src/templates/qquickpane_p_p.h +++ b/src/templates/qquickpane_p_p.h @@ -65,8 +65,6 @@ public: qreal contentHeight; }; -Q_DECLARE_TYPEINFO(QQuickPanePrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKPANE_P_P_H diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h index d2c04316..630b7a4a 100644 --- a/src/templates/qquickpopup_p.h +++ b/src/templates/qquickpopup_p.h @@ -50,6 +50,7 @@ #include <QtCore/qobject.h> #include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> +#include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -116,4 +117,6 @@ private: QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickPopup) + #endif // QQUICKPOPUP_P_H diff --git a/src/templates/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h index f311e1c6..f94c718e 100644 --- a/src/templates/qquickprogressbar_p.h +++ b/src/templates/qquickprogressbar_p.h @@ -108,8 +108,8 @@ private: Q_DECLARE_PRIVATE(QQuickProgressBar) }; -Q_DECLARE_TYPEINFO(QQuickProgressBar, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickProgressBar) + #endif // QQUICKPROGRESSBAR_P_H diff --git a/src/templates/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h index 1667de22..7d664864 100644 --- a/src/templates/qquickradiobutton_p.h +++ b/src/templates/qquickradiobutton_p.h @@ -67,8 +67,8 @@ protected: #endif }; -Q_DECLARE_TYPEINFO(QQuickRadioButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickRadioButton) + #endif // QQUICKRADIOBUTTON_P_H diff --git a/src/templates/qquickrangeslider_p.h b/src/templates/qquickrangeslider_p.h index 3bd46624..604666c8 100644 --- a/src/templates/qquickrangeslider_p.h +++ b/src/templates/qquickrangeslider_p.h @@ -129,8 +129,6 @@ private: Q_DECLARE_PRIVATE(QQuickRangeSlider) }; -Q_DECLARE_TYPEINFO(QQuickRangeSlider, Q_COMPLEX_TYPE); - class QQuickRangeSliderNodePrivate; class Q_LABSTEMPLATES_EXPORT QQuickRangeSliderNode : public QObject @@ -174,8 +172,8 @@ private: Q_DECLARE_PRIVATE(QQuickRangeSliderNode) }; -Q_DECLARE_TYPEINFO(QQuickRangeSliderNode, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickRangeSlider) + #endif // QQUICKRANGESLIDER_H diff --git a/src/templates/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h index df0eb8ee..b944f92a 100644 --- a/src/templates/qquickscrollbar_p.h +++ b/src/templates/qquickscrollbar_p.h @@ -115,8 +115,6 @@ private: Q_DECLARE_PRIVATE(QQuickScrollBar) }; -Q_DECLARE_TYPEINFO(QQuickScrollBar, Q_COMPLEX_TYPE); - class QQuickScrollBarAttachedPrivate; class Q_LABSTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject @@ -144,10 +142,9 @@ private: Q_DECLARE_PRIVATE(QQuickScrollBarAttached) }; -Q_DECLARE_TYPEINFO(QQuickScrollBarAttached, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickScrollBar) QML_DECLARE_TYPEINFO(QQuickScrollBar, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSCROLLBAR_P_H diff --git a/src/templates/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h index 25fdc2fa..1f5f07b7 100644 --- a/src/templates/qquickscrollindicator_p.h +++ b/src/templates/qquickscrollindicator_p.h @@ -103,8 +103,6 @@ private: Q_DECLARE_PRIVATE(QQuickScrollIndicator) }; -Q_DECLARE_TYPEINFO(QQuickScrollIndicator, Q_COMPLEX_TYPE); - class QQuickScrollIndicatorAttachedPrivate; class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject @@ -132,10 +130,9 @@ private: Q_DECLARE_PRIVATE(QQuickScrollIndicatorAttached) }; -Q_DECLARE_TYPEINFO(QQuickScrollIndicatorAttached, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickScrollIndicator) QML_DECLARE_TYPEINFO(QQuickScrollIndicator, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSCROLLINDICATOR_P_H diff --git a/src/templates/qquickslider_p.h b/src/templates/qquickslider_p.h index 02d26538..663ad684 100644 --- a/src/templates/qquickslider_p.h +++ b/src/templates/qquickslider_p.h @@ -146,8 +146,8 @@ private: Q_DECLARE_PRIVATE(QQuickSlider) }; -Q_DECLARE_TYPEINFO(QQuickSlider, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickSlider) + #endif // QQUICKSLIDER_P_H diff --git a/src/templates/qquickspinbox_p.h b/src/templates/qquickspinbox_p.h index edfb3ea0..0ad5e70d 100644 --- a/src/templates/qquickspinbox_p.h +++ b/src/templates/qquickspinbox_p.h @@ -158,9 +158,8 @@ private: Q_DECLARE_PRIVATE(QQuickSpinButton) }; -Q_DECLARE_TYPEINFO(QQuickSpinBox, Q_COMPLEX_TYPE); -Q_DECLARE_TYPEINFO(QQuickSpinButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickSpinBox) + #endif // QQUICKSPINBOX_P_H diff --git a/src/templates/qquickstackview_p.h b/src/templates/qquickstackview_p.h index be73ea85..6b78b50a 100644 --- a/src/templates/qquickstackview_p.h +++ b/src/templates/qquickstackview_p.h @@ -154,8 +154,6 @@ private: Q_DECLARE_PRIVATE(QQuickStackView) }; -Q_DECLARE_TYPEINFO(QQuickStackView, Q_COMPLEX_TYPE); - class QQuickStackAttachedPrivate; class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject @@ -183,11 +181,9 @@ private: Q_DECLARE_PRIVATE(QQuickStackAttached) }; -Q_DECLARE_TYPEINFO(QQuickStackAttached, Q_COMPLEX_TYPE); - QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES) QML_DECLARE_TYPE(QQuickStackView) +QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSTACKVIEW_P_H diff --git a/src/templates/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h index d37334d8..d14c6326 100644 --- a/src/templates/qquickstackview_p_p.h +++ b/src/templates/qquickstackview_p_p.h @@ -100,8 +100,6 @@ public: QV4::PersistentValue properties; }; -Q_DECLARE_TYPEINFO(QQuickStackElement, Q_COMPLEX_TYPE); - class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener { Q_DECLARE_PUBLIC(QQuickStackView) @@ -159,8 +157,6 @@ public: QQuickStackElement *element; }; -Q_DECLARE_TYPEINFO(QQuickStackViewPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKSTACKVIEW_P_P_H diff --git a/src/templates/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h index a40c831e..bf733c7b 100644 --- a/src/templates/qquickswipeview_p.h +++ b/src/templates/qquickswipeview_p.h @@ -100,10 +100,9 @@ private: Q_DECLARE_PRIVATE(QQuickSwipeViewAttached) }; -Q_DECLARE_TYPEINFO(QQuickSwipeView, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickSwipeView) QML_DECLARE_TYPEINFO(QQuickSwipeView, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKSWIPEVIEW_P_H diff --git a/src/templates/qquickswitch_p.h b/src/templates/qquickswitch_p.h index 2670c863..94d0d601 100644 --- a/src/templates/qquickswitch_p.h +++ b/src/templates/qquickswitch_p.h @@ -83,8 +83,8 @@ private: Q_DECLARE_PRIVATE(QQuickSwitch) }; -Q_DECLARE_TYPEINFO(QQuickSwitch, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickSwitch) + #endif // QQUICKSWITCH_P_H diff --git a/src/templates/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h index a1f4ff54..7d6f674c 100644 --- a/src/templates/qquicktabbar_p.h +++ b/src/templates/qquicktabbar_p.h @@ -78,8 +78,8 @@ private: Q_DECLARE_PRIVATE(QQuickTabBar) }; -Q_DECLARE_TYPEINFO(QQuickTabBar, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickTabBar) + #endif // QQUICKTABBAR_P_H diff --git a/src/templates/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h index 0170a2b0..c02a206f 100644 --- a/src/templates/qquicktabbutton_p.h +++ b/src/templates/qquicktabbutton_p.h @@ -67,8 +67,8 @@ protected: #endif }; -Q_DECLARE_TYPEINFO(QQuickTabButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickTabButton) + #endif // QQUICKTABBUTTON_P_H diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index 74eb54dc..acf67359 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -111,8 +111,8 @@ private: Q_DECLARE_PRIVATE(QQuickTextArea) }; -Q_DECLARE_TYPEINFO(QQuickTextArea, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickTextArea) + #endif // QQUICKTEXTAREA_P_H diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h index 7e976da5..2a16e5cc 100644 --- a/src/templates/qquicktextarea_p_p.h +++ b/src/templates/qquicktextarea_p_p.h @@ -98,8 +98,6 @@ public: QQuickAccessibleAttached *accessibleAttached; }; -Q_DECLARE_TYPEINFO(QQuickTextAreaPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKTEXTAREA_P_P_H diff --git a/src/templates/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h index dd4d0b98..23658cc6 100644 --- a/src/templates/qquicktextfield_p.h +++ b/src/templates/qquicktextfield_p.h @@ -111,8 +111,8 @@ private: Q_DECLARE_PRIVATE(QQuickTextField) }; -Q_DECLARE_TYPEINFO(QQuickTextField, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickTextField) + #endif // QQUICKTEXTFIELD_P_H diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h index 82af32c5..29b01f15 100644 --- a/src/templates/qquicktextfield_p_p.h +++ b/src/templates/qquicktextfield_p_p.h @@ -99,8 +99,6 @@ public: QQuickAccessibleAttached *accessibleAttached; }; -Q_DECLARE_TYPEINFO(QQuickTextFieldPrivate, Q_COMPLEX_TYPE); - QT_END_NAMESPACE #endif // QQUICKTEXTFIELD_P_P_H 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 diff --git a/src/templates/qquicktoolbutton_p.h b/src/templates/qquicktoolbutton_p.h index d3bb4fe7..25f2134d 100644 --- a/src/templates/qquicktoolbutton_p.h +++ b/src/templates/qquicktoolbutton_p.h @@ -63,8 +63,8 @@ protected: QFont defaultFont() const Q_DECL_OVERRIDE; }; -Q_DECLARE_TYPEINFO(QQuickToolButton, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickToolButton) + #endif // QQUICKTOOLBUTTON_P_H diff --git a/src/templates/qquicktumbler_p.h b/src/templates/qquicktumbler_p.h index 079cdbb3..ad57acbb 100644 --- a/src/templates/qquicktumbler_p.h +++ b/src/templates/qquicktumbler_p.h @@ -110,8 +110,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateItemHeights()) }; -Q_DECLARE_TYPEINFO(QQuickTumbler, Q_COMPLEX_TYPE); - class QQuickTumblerAttachedPrivate; class Q_LABSTEMPLATES_EXPORT QQuickTumblerAttached : public QObject @@ -137,10 +135,9 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_calculateDisplacement()) }; -Q_DECLARE_TYPEINFO(QQuickTumblerAttached, Q_COMPLEX_TYPE); - QT_END_NAMESPACE +QML_DECLARE_TYPE(QQuickTumbler) QML_DECLARE_TYPEINFO(QQuickTumbler, QML_HAS_ATTACHED_PROPERTIES) #endif // QQUICKTUMBLER_H |