diff options
Diffstat (limited to 'src/imports')
14 files changed, 30 insertions, 33 deletions
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 |