diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2023-11-16 14:00:22 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-11-18 07:37:33 +0000 |
commit | 03d58031c7233e0579f463b9484af8227b0938fd (patch) | |
tree | 5f30e685a0504eb6a9ca76e81b250bffe1311b36 /src/quick | |
parent | 73f66c8f9409eb2b6e5281dd1fd3fec1b063e2c6 (diff) |
Remove all QML_DECLARE_TYPE from src and tools
They are generally not useful for anything.
Change-Id: I12e959ce9338e6eb7465633496c7921fa09a3fe8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick')
61 files changed, 1 insertions, 195 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 9a868f03de..5b44725ddb 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -186,6 +186,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCanvasItem) - #endif //QQUICKCANVASITEM_P_H diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index bda26dfae8..50917d3ecf 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -239,8 +239,6 @@ public: static QMutex mutex; }; - QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickContext2D) #endif // QQUICKCONTEXT2D_P_H diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h index 7b70bdb75c..805933d2a2 100644 --- a/src/quick/items/qquickaccessibleattached_p.h +++ b/src/quick/items/qquickaccessibleattached_p.h @@ -211,8 +211,6 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAccessibleAttached) - #endif // accessibility #endif diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h index 1409cfee06..a1330d1916 100644 --- a/src/quick/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_p.h @@ -180,6 +180,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickAnchors::Anchors) QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAnchors) - #endif // QQUICKANCHORS_P_H diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h index 72eab4d0bf..487070d52c 100644 --- a/src/quick/items/qquickanimatedimage_p.h +++ b/src/quick/items/qquickanimatedimage_p.h @@ -85,6 +85,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAnimatedImage) - #endif // QQUICKANIMATEDIMAGE_P_H diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h index cbcf8e0b7c..5ebbd46b38 100644 --- a/src/quick/items/qquickborderimage_p.h +++ b/src/quick/items/qquickborderimage_p.h @@ -77,6 +77,5 @@ private: }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBorderImage) #endif // QQUICKBORDERIMAGE_P_H diff --git a/src/quick/items/qquickcolorgroup_p.h b/src/quick/items/qquickcolorgroup_p.h index dada14c2fc..2d63d3dc42 100644 --- a/src/quick/items/qquickcolorgroup_p.h +++ b/src/quick/items/qquickcolorgroup_p.h @@ -205,6 +205,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickColorGroup) - #endif // QQUICKCOLORGROUP_H diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h index 82b32b60e0..c2e29dff05 100644 --- a/src/quick/items/qquickdrag_p.h +++ b/src/quick/items/qquickdrag_p.h @@ -291,6 +291,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDrag) - #endif diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h index 89441c9eb2..cd5ab59ec0 100644 --- a/src/quick/items/qquickdroparea_p.h +++ b/src/quick/items/qquickdroparea_p.h @@ -161,6 +161,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDropArea) - #endif // QQUICKDROPAREA_P_H diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index f3b2fb9016..fa81b04764 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -255,14 +255,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickKeyEvent) -QML_DECLARE_TYPE(QQuickMouseEvent) -#if QT_CONFIG(wheelevent) -QML_DECLARE_TYPE(QQuickWheelEvent) -#endif -QML_DECLARE_TYPE(QQuickCloseEvent) -QML_DECLARE_TYPE(QPointingDevice) -QML_DECLARE_TYPE(QPointingDeviceUniqueId) -QML_DECLARE_TYPE(QPointerEvent) - #endif // QQUICKEVENTS_P_P_H diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h index b70b181a61..fc7070b062 100644 --- a/src/quick/items/qquickflickable_p.h +++ b/src/quick/items/qquickflickable_p.h @@ -287,6 +287,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFlickable) - #endif // QQUICKFLICKABLE_P_H diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 0a113be79d..f58bf299a6 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -287,6 +287,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFlickableVisibleArea) - #endif // QQUICKFLICKABLE_P_P_H diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h index b1943f9500..8585a368b7 100644 --- a/src/quick/items/qquickflipable_p.h +++ b/src/quick/items/qquickflipable_p.h @@ -71,6 +71,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFlipable) - #endif // QQUICKFLIPABLE_P_H diff --git a/src/quick/items/qquickfocusscope_p.h b/src/quick/items/qquickfocusscope_p.h index 530227f8ec..c76e11f153 100644 --- a/src/quick/items/qquickfocusscope_p.h +++ b/src/quick/items/qquickfocusscope_p.h @@ -32,6 +32,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFocusScope) - #endif // QQUICKFOCUSSCOPE_P_H diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h index cdd4048ffe..68377a6943 100644 --- a/src/quick/items/qquickgridview_p.h +++ b/src/quick/items/qquickgridview_p.h @@ -101,6 +101,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickGridView) - #endif // QQUICKGRIDVIEW_P_H diff --git a/src/quick/items/qquickimage_p.h b/src/quick/items/qquickimage_p.h index b6f8e369b7..1aefb0b04e 100644 --- a/src/quick/items/qquickimage_p.h +++ b/src/quick/items/qquickimage_p.h @@ -101,5 +101,5 @@ private: }; QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickImage) + #endif // QQUICKIMAGE_P_H diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index 4a7b0d8522..5c0220ed40 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -504,7 +504,4 @@ QDebug Q_QUICK_EXPORT operator<<(QDebug debug, QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickItem) -QML_DECLARE_TYPE(QQuickTransform) - #endif // QQUICKITEM_H diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 698b892806..205169066a 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -1047,12 +1047,4 @@ Q_DECLARE_TYPEINFO(QQuickItemPrivate::ChangeListener, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE -#if QT_CONFIG(quick_shadereffect) -QML_DECLARE_TYPE(QQuickItemLayer) -#endif -QML_DECLARE_TYPE(QQuickKeysAttached) -QML_DECLARE_TYPE(QQuickKeyNavigationAttached) -QML_DECLARE_TYPE(QQuickLayoutMirroringAttached) -QML_DECLARE_TYPE(QQuickEnterKeyAttached) - #endif // QQUICKITEM_P_H diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h index afd0bb3600..3812b10630 100644 --- a/src/quick/items/qquickitemanimation_p.h +++ b/src/quick/items/qquickitemanimation_p.h @@ -174,10 +174,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickParentAnimation) -QML_DECLARE_TYPE(QQuickAnchorAnimation) -#if QT_CONFIG(quick_path) -QML_DECLARE_TYPE(QQuickPathAnimation) -#endif - #endif // QQUICKITEMANIMATION_H diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index c948533415..6d81a2a1d3 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -198,6 +198,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickViewTransitionAttached) - #endif // QQUICKITEMVIEWTRANSITION_P_P_H diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index a4942a2f55..0451d65140 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -187,7 +187,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickListView) -QML_DECLARE_TYPE(QQuickViewSection) - #endif // QQUICKLISTVIEW_P_H diff --git a/src/quick/items/qquickloader_p.h b/src/quick/items/qquickloader_p.h index 9d99cd5ef0..beac80c22d 100644 --- a/src/quick/items/qquickloader_p.h +++ b/src/quick/items/qquickloader_p.h @@ -90,6 +90,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLoader) - #endif // QQUICKLOADER_P_H diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index a4439ad885..3d20c59e73 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -163,6 +163,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMouseArea) - #endif // QQUICKMOUSEAREA_P_H diff --git a/src/quick/items/qquickmultipointtoucharea_p.h b/src/quick/items/qquickmultipointtoucharea_p.h index a72f425d6f..37c5219cb1 100644 --- a/src/quick/items/qquickmultipointtoucharea_p.h +++ b/src/quick/items/qquickmultipointtoucharea_p.h @@ -290,8 +290,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTouchPoint) -QML_DECLARE_TYPE(QQuickGrabGestureEvent) -QML_DECLARE_TYPE(QQuickMultiPointTouchArea) - #endif // QQUICKMULTIPOINTTOUCHAREA_H diff --git a/src/quick/items/qquickpalette_p.h b/src/quick/items/qquickpalette_p.h index 7ea36a5b45..af3817c6a4 100644 --- a/src/quick/items/qquickpalette_p.h +++ b/src/quick/items/qquickpalette_p.h @@ -93,6 +93,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPalette) - #endif // QQUICKPALETTE_H diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h index 9e0ae83e2c..e29a93c619 100644 --- a/src/quick/items/qquickpathview_p.h +++ b/src/quick/items/qquickpathview_p.h @@ -264,6 +264,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPathView) - #endif // QQUICKPATHVIEW_P_H diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h index 87fe6e6bdd..6971a38079 100644 --- a/src/quick/items/qquickpincharea_p.h +++ b/src/quick/items/qquickpincharea_p.h @@ -277,9 +277,5 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPinch) -QML_DECLARE_TYPE(QQuickPinchEvent) -QML_DECLARE_TYPE(QQuickPinchArea) - #endif // QQUICKPINCHAREA_H diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h index 2d3b1b5c9a..dd19086006 100644 --- a/src/quick/items/qquickpositioners_p.h +++ b/src/quick/items/qquickpositioners_p.h @@ -370,14 +370,6 @@ private: Q_DECLARE_PRIVATE(QQuickFlow) }; - QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickColumn) -QML_DECLARE_TYPE(QQuickRow) -QML_DECLARE_TYPE(QQuickGrid) -QML_DECLARE_TYPE(QQuickFlow) - -QML_DECLARE_TYPE(QQuickBasePositioner) - #endif // QQUICKPOSITIONERS_P_H diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h index 1571984eba..3f47aca42a 100644 --- a/src/quick/items/qquickrectangle_p.h +++ b/src/quick/items/qquickrectangle_p.h @@ -188,9 +188,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPen) -QML_DECLARE_TYPE(QQuickGradientStop) -QML_DECLARE_TYPE(QQuickGradient) -QML_DECLARE_TYPE(QQuickRectangle) - #endif // QQUICKRECTANGLE_P_H diff --git a/src/quick/items/qquickrepeater_p.h b/src/quick/items/qquickrepeater_p.h index f0b2da847c..dcd0c44901 100644 --- a/src/quick/items/qquickrepeater_p.h +++ b/src/quick/items/qquickrepeater_p.h @@ -79,6 +79,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRepeater) - #endif // QQUICKREPEATER_P_H diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index f7d6d84c98..3e0f5038b4 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -99,6 +99,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScaleGrid) - #endif // QQUICKSCALEGRID_P_P_H diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 7481a30b3f..c86c337f30 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -130,6 +130,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScreenInfo) - #endif diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h index dea8e4c8bf..5a6a824472 100644 --- a/src/quick/items/qquickstateoperations_p.h +++ b/src/quick/items/qquickstateoperations_p.h @@ -185,9 +185,5 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickParentChange) -QML_DECLARE_TYPE(QQuickAnchorSet) -QML_DECLARE_TYPE(QQuickAnchorChanges) - #endif // QQUICKSTATEOPERATIONS_P_H diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h index 9a607ffebb..713e5e2e94 100644 --- a/src/quick/items/qquicktableview_p.h +++ b/src/quick/items/qquicktableview_p.h @@ -332,6 +332,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickTableView::EditTriggers) QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTableView) - #endif // QQUICKTABLEVIEW_P_H diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h index d827a0e5d7..c4c48286b2 100644 --- a/src/quick/items/qquicktext_p.h +++ b/src/quick/items/qquicktext_p.h @@ -355,7 +355,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickText) -QML_DECLARE_TYPE(QQuickTextLine) - #endif // QQUICKTEXT_P_H diff --git a/src/quick/items/qquicktextdocument.h b/src/quick/items/qquicktextdocument.h index b73a76ec39..9d6eb47a79 100644 --- a/src/quick/items/qquicktextdocument.h +++ b/src/quick/items/qquicktextdocument.h @@ -27,6 +27,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextDocument) - #endif diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index 2a3d01353c..547c69572e 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -412,6 +412,4 @@ Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, QQuickTextEdit::HAlignment, QQuick QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextEdit) - #endif // QQUICKTEXTEDIT_P_H diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index d9c8328921..93e76170d3 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -416,6 +416,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextInput) - #endif // QQUICKTEXTINPUT_P_H diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index f311eaa982..f96e5fae0d 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_p.h @@ -151,6 +151,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTranslate) - #endif diff --git a/src/quick/items/qquicktreeview_p.h b/src/quick/items/qquicktreeview_p.h index 5573fd634a..bb5792b98f 100644 --- a/src/quick/items/qquicktreeview_p.h +++ b/src/quick/items/qquicktreeview_p.h @@ -71,6 +71,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTreeView) - #endif // QQUICKTREEVIEW_P_H diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h index 2112665556..39f4656a90 100644 --- a/src/quick/items/qquickwindowmodule_p.h +++ b/src/quick/items/qquickwindowmodule_p.h @@ -84,6 +84,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWindowQmlImpl) - #endif diff --git a/src/quick/util/qquickanimation_p.h b/src/quick/util/qquickanimation_p.h index 349478333a..63298ab2c8 100644 --- a/src/quick/util/qquickanimation_p.h +++ b/src/quick/util/qquickanimation_p.h @@ -452,16 +452,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAbstractAnimation) -QML_DECLARE_TYPE(QQuickPauseAnimation) -QML_DECLARE_TYPE(QQuickScriptAction) -QML_DECLARE_TYPE(QQuickPropertyAction) -QML_DECLARE_TYPE(QQuickPropertyAnimation) -QML_DECLARE_TYPE(QQuickColorAnimation) -QML_DECLARE_TYPE(QQuickNumberAnimation) -QML_DECLARE_TYPE(QQuickSequentialAnimation) -QML_DECLARE_TYPE(QQuickParallelAnimation) -QML_DECLARE_TYPE(QQuickVector3dAnimation) -QML_DECLARE_TYPE(QQuickRotationAnimation) - #endif // QQUICKANIMATION_H diff --git a/src/quick/util/qquickanimationcontroller_p.h b/src/quick/util/qquickanimationcontroller_p.h index 54a2b468d6..d81d6cfe60 100644 --- a/src/quick/util/qquickanimationcontroller_p.h +++ b/src/quick/util/qquickanimationcontroller_p.h @@ -60,6 +60,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAnimationController) - #endif // QQUICKANIMATIONCONTROLLER_H diff --git a/src/quick/util/qquickanimator_p.h b/src/quick/util/qquickanimator_p.h index af0cb01ac1..045edc4baa 100644 --- a/src/quick/util/qquickanimator_p.h +++ b/src/quick/util/qquickanimator_p.h @@ -174,13 +174,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAnimator) -QML_DECLARE_TYPE(QQuickXAnimator) -QML_DECLARE_TYPE(QQuickYAnimator) -QML_DECLARE_TYPE(QQuickScaleAnimator) -QML_DECLARE_TYPE(QQuickRotationAnimator) -QML_DECLARE_TYPE(QQuickOpacityAnimator) -#if QT_CONFIG(quick_shadereffect) -QML_DECLARE_TYPE(QQuickUniformAnimator) -#endif #endif // QQUICKANIMATOR_P_H diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h index 19cd38fc0e..deb206be15 100644 --- a/src/quick/util/qquickapplication_p.h +++ b/src/quick/util/qquickapplication_p.h @@ -74,6 +74,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickApplication) - #endif // QQUICKAPPLICATION_P_H diff --git a/src/quick/util/qquickbehavior_p.h b/src/quick/util/qquickbehavior_p.h index 44264ceacb..4c97aa13ab 100644 --- a/src/quick/util/qquickbehavior_p.h +++ b/src/quick/util/qquickbehavior_p.h @@ -70,6 +70,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBehavior) - #endif // QQUICKBEHAVIOR_H diff --git a/src/quick/util/qquickfontloader_p.h b/src/quick/util/qquickfontloader_p.h index fa2bac3881..2b00e78b55 100644 --- a/src/quick/util/qquickfontloader_p.h +++ b/src/quick/util/qquickfontloader_p.h @@ -64,7 +64,5 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFontLoader) - #endif // QQUICKFONTLOADER_H diff --git a/src/quick/util/qquickfontmetrics_p.h b/src/quick/util/qquickfontmetrics_p.h index c724ad1d9d..ba0fccddac 100644 --- a/src/quick/util/qquickfontmetrics_p.h +++ b/src/quick/util/qquickfontmetrics_p.h @@ -86,6 +86,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFontMetrics) - #endif // QQUICKFONTMETRICS_H diff --git a/src/quick/util/qquickframeanimation_p.h b/src/quick/util/qquickframeanimation_p.h index fe0eec87b0..49f131684a 100644 --- a/src/quick/util/qquickframeanimation_p.h +++ b/src/quick/util/qquickframeanimation_p.h @@ -80,6 +80,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFrameAnimation) - #endif diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h index e1398e474c..a3fe914bad 100644 --- a/src/quick/util/qquickpath_p.h +++ b/src/quick/util/qquickpath_p.h @@ -681,20 +681,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPathElement) -QML_DECLARE_TYPE(QQuickPathAttribute) -QML_DECLARE_TYPE(QQuickCurve) -QML_DECLARE_TYPE(QQuickPathLine) -QML_DECLARE_TYPE(QQuickPathMove) -QML_DECLARE_TYPE(QQuickPathQuad) -QML_DECLARE_TYPE(QQuickPathCubic) -QML_DECLARE_TYPE(QQuickPathCatmullRomCurve) -QML_DECLARE_TYPE(QQuickPathArc) -QML_DECLARE_TYPE(QQuickPathAngleArc) -QML_DECLARE_TYPE(QQuickPathSvg) -QML_DECLARE_TYPE(QQuickPathPercent) -QML_DECLARE_TYPE(QQuickPathPolyline) -QML_DECLARE_TYPE(QQuickPath) -QML_DECLARE_TYPE(QQuickPathText) - #endif // QQUICKPATH_H diff --git a/src/quick/util/qquickpathinterpolator_p.h b/src/quick/util/qquickpathinterpolator_p.h index c5322336f3..238cf1ebd0 100644 --- a/src/quick/util/qquickpathinterpolator_p.h +++ b/src/quick/util/qquickpathinterpolator_p.h @@ -68,6 +68,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPathInterpolator) - #endif // QQUICKPATHINTERPOLATOR_P_H diff --git a/src/quick/util/qquickpropertychanges_p.h b/src/quick/util/qquickpropertychanges_p.h index 6b8079328d..902ec4a7c3 100644 --- a/src/quick/util/qquickpropertychanges_p.h +++ b/src/quick/util/qquickpropertychanges_p.h @@ -89,6 +89,4 @@ inline QQmlCustomParser *qmlCreateCustomParser<QQuickPropertyChanges>() QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPropertyChanges) - #endif // QQUICKPROPERTYCHANGES_H diff --git a/src/quick/util/qquicksmoothedanimation_p.h b/src/quick/util/qquicksmoothedanimation_p.h index 87162b6539..5378e41468 100644 --- a/src/quick/util/qquicksmoothedanimation_p.h +++ b/src/quick/util/qquicksmoothedanimation_p.h @@ -65,6 +65,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSmoothedAnimation) - #endif // QQUICKSMOOTHEDANIMATION_H diff --git a/src/quick/util/qquickspringanimation_p.h b/src/quick/util/qquickspringanimation_p.h index bb84a8bc35..5310fffea4 100644 --- a/src/quick/util/qquickspringanimation_p.h +++ b/src/quick/util/qquickspringanimation_p.h @@ -74,6 +74,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSpringAnimation) - #endif // QQUICKSPRINGANIMATION_H diff --git a/src/quick/util/qquickstate_p.h b/src/quick/util/qquickstate_p.h index da9b375cff..bdfa5845a4 100644 --- a/src/quick/util/qquickstate_p.h +++ b/src/quick/util/qquickstate_p.h @@ -178,7 +178,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStateOperation) -QML_DECLARE_TYPE(QQuickState) - #endif // QQUICKSTATE_H diff --git a/src/quick/util/qquickstatechangescript_p.h b/src/quick/util/qquickstatechangescript_p.h index 709b51fcec..75deaef7b2 100644 --- a/src/quick/util/qquickstatechangescript_p.h +++ b/src/quick/util/qquickstatechangescript_p.h @@ -50,6 +50,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStateChangeScript) - #endif // QQUICKSTATEOPERATIONS_H diff --git a/src/quick/util/qquickstategroup_p.h b/src/quick/util/qquickstategroup_p.h index 82d6f8c3a8..dd198c9f03 100644 --- a/src/quick/util/qquickstategroup_p.h +++ b/src/quick/util/qquickstategroup_p.h @@ -61,6 +61,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStateGroup) - #endif // QQUICKSTATEGROUP_H diff --git a/src/quick/util/qquicksystempalette_p.h b/src/quick/util/qquicksystempalette_p.h index 7a77756957..d09b989447 100644 --- a/src/quick/util/qquicksystempalette_p.h +++ b/src/quick/util/qquicksystempalette_p.h @@ -86,6 +86,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSystemPalette) - #endif // QQUICKSYSTEMPALETTE_H diff --git a/src/quick/util/qquicktextmetrics_p.h b/src/quick/util/qquicktextmetrics_p.h index f98d877f24..3a6ae2ad5c 100644 --- a/src/quick/util/qquicktextmetrics_p.h +++ b/src/quick/util/qquicktextmetrics_p.h @@ -91,6 +91,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextMetrics) - #endif // QQUICKTEXTMETRICS_H diff --git a/src/quick/util/qquicktransition_p.h b/src/quick/util/qquicktransition_p.h index dd59e1e50c..84e2b12418 100644 --- a/src/quick/util/qquicktransition_p.h +++ b/src/quick/util/qquicktransition_p.h @@ -108,6 +108,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTransition) - #endif // QQUICKTRANSITION_H diff --git a/src/quick/util/qquickvalidator_p.h b/src/quick/util/qquickvalidator_p.h index 855beec67b..56aef6df5b 100644 --- a/src/quick/util/qquickvalidator_p.h +++ b/src/quick/util/qquickvalidator_p.h @@ -61,13 +61,4 @@ Q_SIGNALS: QT_END_NAMESPACE -#if QT_CONFIG(validator) -QML_DECLARE_TYPE(QValidator) -QML_DECLARE_TYPE(QQuickIntValidator) -QML_DECLARE_TYPE(QQuickDoubleValidator) -#if QT_CONFIG(regularexpression) -QML_DECLARE_TYPE(QRegularExpressionValidator) -#endif -#endif - #endif // QQUICKVALIDATOR_P_H |