diff options
191 files changed, 1 insertions, 465 deletions
diff --git a/src/labs/animation/qquickboundaryrule_p.h b/src/labs/animation/qquickboundaryrule_p.h index 071a390aee..52e617b35e 100644 --- a/src/labs/animation/qquickboundaryrule_p.h +++ b/src/labs/animation/qquickboundaryrule_p.h @@ -111,6 +111,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBoundaryRule) - #endif // QQUICKBOUNDARYRULE_H diff --git a/src/labs/models/qqmldelegatecomponent_p.h b/src/labs/models/qqmldelegatecomponent_p.h index 79504a10ea..ce37e823ab 100644 --- a/src/labs/models/qqmldelegatecomponent_p.h +++ b/src/labs/models/qqmldelegatecomponent_p.h @@ -101,7 +101,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlDelegateChoice) -QML_DECLARE_TYPE(QQmlDelegateChooser) - #endif // QQMLDELEGATECOMPONENT_P_H diff --git a/src/labs/models/qqmltablemodel_p.h b/src/labs/models/qqmltablemodel_p.h index 323c07e285..f116112d95 100644 --- a/src/labs/models/qqmltablemodel_p.h +++ b/src/labs/models/qqmltablemodel_p.h @@ -140,6 +140,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlTableModel) - #endif // QQMLTABLEMODEL_P_H diff --git a/src/labs/models/qqmltablemodelcolumn_p.h b/src/labs/models/qqmltablemodelcolumn_p.h index e0b812f4b4..766e83b0c3 100644 --- a/src/labs/models/qqmltablemodelcolumn_p.h +++ b/src/labs/models/qqmltablemodelcolumn_p.h @@ -188,6 +188,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlTableModelColumn) - #endif // QQMLTABLEMODELCOLUMN_P_H diff --git a/src/labs/platform/qquicklabsplatformcolordialog_p.h b/src/labs/platform/qquicklabsplatformcolordialog_p.h index cde2fd0a5d..b9f025731e 100644 --- a/src/labs/platform/qquicklabsplatformcolordialog_p.h +++ b/src/labs/platform/qquicklabsplatformcolordialog_p.h @@ -61,6 +61,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformColorDialog) - #endif // QQUICKLABSPLATFORMCOLORDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformdialog_p.h b/src/labs/platform/qquicklabsplatformdialog_p.h index e04b097694..fc222b8ba4 100644 --- a/src/labs/platform/qquicklabsplatformdialog_p.h +++ b/src/labs/platform/qquicklabsplatformdialog_p.h @@ -126,6 +126,4 @@ class QPlatformDialogHelperQuickLabsForeign QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformDialog) - #endif // QQUICKLABSPLATFORMDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformfiledialog_p.h b/src/labs/platform/qquicklabsplatformfiledialog_p.h index 89146dc090..9bfd8906e7 100644 --- a/src/labs/platform/qquicklabsplatformfiledialog_p.h +++ b/src/labs/platform/qquicklabsplatformfiledialog_p.h @@ -161,6 +161,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformFileDialog) - #endif // QQUICKLABSPLATFORMFILEDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformfolderdialog_p.h b/src/labs/platform/qquicklabsplatformfolderdialog_p.h index f05749a6e4..334b0f6479 100644 --- a/src/labs/platform/qquicklabsplatformfolderdialog_p.h +++ b/src/labs/platform/qquicklabsplatformfolderdialog_p.h @@ -73,6 +73,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformFolderDialog) - #endif // QQUICKLABSPLATFORMFOLDERDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformfontdialog_p.h b/src/labs/platform/qquicklabsplatformfontdialog_p.h index 31aed5928f..8f7d07091d 100644 --- a/src/labs/platform/qquicklabsplatformfontdialog_p.h +++ b/src/labs/platform/qquicklabsplatformfontdialog_p.h @@ -61,6 +61,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformFontDialog) - #endif // QQUICKLABSPLATFORMFONTDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformmenu_p.h b/src/labs/platform/qquicklabsplatformmenu_p.h index b8577dcf49..4f4f3eacb1 100644 --- a/src/labs/platform/qquicklabsplatformmenu_p.h +++ b/src/labs/platform/qquicklabsplatformmenu_p.h @@ -179,6 +179,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMenu) - #endif // QQUICKLABSPLATFORMMENU_P_H diff --git a/src/labs/platform/qquicklabsplatformmenubar_p.h b/src/labs/platform/qquicklabsplatformmenubar_p.h index 28a3fe5652..2f08f4eb27 100644 --- a/src/labs/platform/qquicklabsplatformmenubar_p.h +++ b/src/labs/platform/qquicklabsplatformmenubar_p.h @@ -84,6 +84,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMenuBar) - #endif // QQUICKLABSPLATFORMMENUBAR_P_H diff --git a/src/labs/platform/qquicklabsplatformmenuitem_p.h b/src/labs/platform/qquicklabsplatformmenuitem_p.h index f02f2536fd..62c4c8a959 100644 --- a/src/labs/platform/qquicklabsplatformmenuitem_p.h +++ b/src/labs/platform/qquicklabsplatformmenuitem_p.h @@ -157,6 +157,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMenuItem) - #endif // QQUICKLABSPLATFORMMENUITEM_P_H diff --git a/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h b/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h index 531eecb5d3..f4f1cc6ae3 100644 --- a/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h +++ b/src/labs/platform/qquicklabsplatformmenuitemgroup_p.h @@ -87,6 +87,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMenuItemGroup) - #endif // QQUICKLABSPLATFORMMENUITEMGROUP_P_H diff --git a/src/labs/platform/qquicklabsplatformmenuseparator_p.h b/src/labs/platform/qquicklabsplatformmenuseparator_p.h index cc8c518b0a..364c592c20 100644 --- a/src/labs/platform/qquicklabsplatformmenuseparator_p.h +++ b/src/labs/platform/qquicklabsplatformmenuseparator_p.h @@ -29,6 +29,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMenuSeparator) - #endif // QQUICKLABSPLATFORMMENUSEPARATOR_P_H diff --git a/src/labs/platform/qquicklabsplatformmessagedialog_p.h b/src/labs/platform/qquicklabsplatformmessagedialog_p.h index 9426448a3e..8b42c78f34 100644 --- a/src/labs/platform/qquicklabsplatformmessagedialog_p.h +++ b/src/labs/platform/qquicklabsplatformmessagedialog_p.h @@ -84,6 +84,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformMessageDialog) - #endif // QQUICKLABSPLATFORMMESSAGEDIALOG_P_H diff --git a/src/labs/platform/qquicklabsplatformstandardpaths_p.h b/src/labs/platform/qquicklabsplatformstandardpaths_p.h index 9941c3081e..80f4995129 100644 --- a/src/labs/platform/qquicklabsplatformstandardpaths_p.h +++ b/src/labs/platform/qquicklabsplatformstandardpaths_p.h @@ -54,10 +54,6 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformStandardPaths) -Q_DECLARE_METATYPE(QStandardPaths::StandardLocation) -Q_DECLARE_METATYPE(QStandardPaths::LocateOptions) - #endif // QT_DEPRECATED_SINCE(6, 4) #endif // QQUICKLABSPLATFORMSTANDARDPATHS_P_H diff --git a/src/labs/platform/qquicklabsplatformsystemtrayicon_p.h b/src/labs/platform/qquicklabsplatformsystemtrayicon_p.h index 4adac1a8f7..f5c46aa53e 100644 --- a/src/labs/platform/qquicklabsplatformsystemtrayicon_p.h +++ b/src/labs/platform/qquicklabsplatformsystemtrayicon_p.h @@ -106,8 +106,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabsPlatformSystemTrayIcon) -Q_DECLARE_METATYPE(QPlatformSystemTrayIcon::ActivationReason) -Q_DECLARE_METATYPE(QPlatformSystemTrayIcon::MessageIcon) - #endif // QQUICKLABSPLATFORMSYSTEMTRAYICON_P_H diff --git a/src/labs/settings/qqmlsettings_p.h b/src/labs/settings/qqmlsettings_p.h index 895df8c5e3..e22facd84d 100644 --- a/src/labs/settings/qqmlsettings_p.h +++ b/src/labs/settings/qqmlsettings_p.h @@ -64,6 +64,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlSettings) - #endif // QQMLSETTINGS_P_H diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h index 2177ceb951..e435aa2894 100644 --- a/src/qml/qml/qqmlcomponent.h +++ b/src/qml/qml/qqmlcomponent.h @@ -139,8 +139,6 @@ struct OverridableAttachedType<QQmlComponent, QQmlComponentAttached> } // namespace QQmlPrivate - QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlComponent) #endif // QQMLCOMPONENT_H diff --git a/src/qml/qml/qqmlplatform_p.h b/src/qml/qml/qqmlplatform_p.h index 567a2f0f64..6595899f58 100644 --- a/src/qml/qml/qqmlplatform_p.h +++ b/src/qml/qml/qqmlplatform_p.h @@ -42,6 +42,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlPlatform) - #endif // QQMLPLATFORM_P_H diff --git a/src/qml/types/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h index 31d1c53552..ab805057b5 100644 --- a/src/qml/types/qqmlbind_p.h +++ b/src/qml/types/qqmlbind_p.h @@ -89,6 +89,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlBind) - #endif diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h index bb23caecf5..376ba0c2fe 100644 --- a/src/qml/types/qqmlconnections_p.h +++ b/src/qml/types/qqmlconnections_p.h @@ -83,6 +83,4 @@ inline QQmlCustomParser *qmlCreateCustomParser<QQmlConnections>() QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlConnections) - #endif diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h index c5a7f2bd11..db6e3e1057 100644 --- a/src/qml/types/qqmltimer_p.h +++ b/src/qml/types/qqmltimer_p.h @@ -82,6 +82,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlTimer) - #endif diff --git a/src/qmlmodels/qqmldelegatemodel_p.h b/src/qmlmodels/qqmldelegatemodel_p.h index 317067333d..7156383381 100644 --- a/src/qmlmodels/qqmldelegatemodel_p.h +++ b/src/qmlmodels/qqmldelegatemodel_p.h @@ -233,7 +233,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlDelegateModel) -QML_DECLARE_TYPE(QQmlDelegateModelGroup) - #endif // QQMLDATAMODEL_P_H diff --git a/src/qmlmodels/qqmllistmodel_p.h b/src/qmlmodels/qqmllistmodel_p.h index fa2e39309d..e713aa99ff 100644 --- a/src/qmlmodels/qqmllistmodel_p.h +++ b/src/qmlmodels/qqmllistmodel_p.h @@ -181,7 +181,4 @@ inline QQmlCustomParser *qmlCreateCustomParser<QQmlListModel>() QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlListModel) -QML_DECLARE_TYPE(QQmlListElement) - #endif // QQMLLISTMODEL_H diff --git a/src/qmlmodels/qqmlobjectmodel_p.h b/src/qmlmodels/qqmlobjectmodel_p.h index ed69361945..f63248b291 100644 --- a/src/qmlmodels/qqmlobjectmodel_p.h +++ b/src/qmlmodels/qqmlobjectmodel_p.h @@ -168,7 +168,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlInstanceModel) -QML_DECLARE_TYPE(QQmlObjectModel) - #endif // QQMLINSTANCEMODEL_P_H diff --git a/src/qmlmodels/qquickpackage_p.h b/src/qmlmodels/qquickpackage_p.h index b8cc7d693d..d339ae920f 100644 --- a/src/qmlmodels/qquickpackage_p.h +++ b/src/qmlmodels/qquickpackage_p.h @@ -64,6 +64,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPackage) - #endif // QQUICKPACKAGE_H diff --git a/src/qmlworkerscript/qquickworkerscript_p.h b/src/qmlworkerscript/qquickworkerscript_p.h index d2cf5d6601..c91dff4f61 100644 --- a/src/qmlworkerscript/qquickworkerscript_p.h +++ b/src/qmlworkerscript/qquickworkerscript_p.h @@ -91,6 +91,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWorkerScript) - #endif // QQUICKWORKERSCRIPT_P_H 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 diff --git a/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h index a39b61cde4..edf9d68078 100644 --- a/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h +++ b/src/quickcontrols/basic/impl/qquickbasicbusyindicator_p.h @@ -56,6 +56,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBasicBusyIndicator) - #endif // QQUICKDEFAULTBUSYINDICATOR_P_H diff --git a/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h b/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h index 72b5521263..5ca901924e 100644 --- a/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h +++ b/src/quickcontrols/basic/impl/qquickbasicprogressbar_p.h @@ -54,6 +54,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBasicProgressBar) - #endif // QQUICKDEFAULTPROGRESSBAR_P_H diff --git a/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h b/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h index b6bbd925c7..c18257127d 100644 --- a/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h +++ b/src/quickcontrols/material/impl/qquickmaterialbusyindicator_p.h @@ -51,6 +51,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMaterialBusyIndicator) - #endif // QQUICKMATERIALBUSYINDICATOR_P_H diff --git a/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h b/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h index d250c2f76d..46d5c1b20f 100644 --- a/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h +++ b/src/quickcontrols/material/impl/qquickmaterialprogressbar_p.h @@ -54,6 +54,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMaterialProgressBar) - #endif // QQUICKMATERIALPROGRESSBAR_P_H diff --git a/src/quickcontrols/material/impl/qquickmaterialripple_p.h b/src/quickcontrols/material/impl/qquickmaterialripple_p.h index cdaaf13b1a..d0772052bd 100644 --- a/src/quickcontrols/material/impl/qquickmaterialripple_p.h +++ b/src/quickcontrols/material/impl/qquickmaterialripple_p.h @@ -83,6 +83,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMaterialRipple) - #endif // QQUICKMATERIALRIPPLE_P_H diff --git a/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h index 1000bbab09..ef785e685e 100644 --- a/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h +++ b/src/quickcontrols/universal/impl/qquickuniversalbusyindicator_p.h @@ -52,6 +52,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickUniversalBusyIndicator) - #endif // QQUICKUNIVERSALBUSYINDICATOR_P_H diff --git a/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h b/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h index a4bbae8cb5..6def3d2842 100644 --- a/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h +++ b/src/quickcontrols/universal/impl/qquickuniversalprogressbar_p.h @@ -54,6 +54,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickUniversalProgressBar) - #endif // QQUICKUNIVERSALPROGRESSBAR_P_H diff --git a/src/quickcontrolsimpl/qquickchecklabel_p.h b/src/quickcontrolsimpl/qquickchecklabel_p.h index 2419433c68..c259a69118 100644 --- a/src/quickcontrolsimpl/qquickchecklabel_p.h +++ b/src/quickcontrolsimpl/qquickchecklabel_p.h @@ -40,6 +40,4 @@ struct QQuickTextForeign QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCheckLabel) - #endif // QQUICKCHECKLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickclippedtext_p.h b/src/quickcontrolsimpl/qquickclippedtext_p.h index 4ae1c05f3f..002db62937 100644 --- a/src/quickcontrolsimpl/qquickclippedtext_p.h +++ b/src/quickcontrolsimpl/qquickclippedtext_p.h @@ -60,6 +60,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickClippedText) - #endif // QQUICKCLIPPEDTEXT_P_H diff --git a/src/quickcontrolsimpl/qquickiconimage_p.h b/src/quickcontrolsimpl/qquickiconimage_p.h index d46bbab9f4..9a9c420450 100644 --- a/src/quickcontrolsimpl/qquickiconimage_p.h +++ b/src/quickcontrolsimpl/qquickiconimage_p.h @@ -58,6 +58,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickIconImage) - #endif // QQUICKICONIMAGE_P_H diff --git a/src/quickcontrolsimpl/qquickiconlabel_p.h b/src/quickcontrolsimpl/qquickiconlabel_p.h index ac3e452c74..e9c9c194ef 100644 --- a/src/quickcontrolsimpl/qquickiconlabel_p.h +++ b/src/quickcontrolsimpl/qquickiconlabel_p.h @@ -104,6 +104,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickIconLabel) - #endif // QQUICKICONLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickimageselector_p.h b/src/quickcontrolsimpl/qquickimageselector_p.h index 02eab385fb..c5ddf7de50 100644 --- a/src/quickcontrolsimpl/qquickimageselector_p.h +++ b/src/quickcontrolsimpl/qquickimageselector_p.h @@ -118,7 +118,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickImageSelector) -QML_DECLARE_TYPE(QQuickAnimatedImageSelector) - #endif // QQUICKIMAGESELECTOR_P_H diff --git a/src/quickcontrolsimpl/qquickitemgroup_p.h b/src/quickcontrolsimpl/qquickitemgroup_p.h index a1ce320d1c..92c73c9d6b 100644 --- a/src/quickcontrolsimpl/qquickitemgroup_p.h +++ b/src/quickcontrolsimpl/qquickitemgroup_p.h @@ -47,6 +47,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickItemGroup) - #endif // QQUICKITEMGROUP_P_H diff --git a/src/quickcontrolsimpl/qquickmnemoniclabel_p.h b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h index 825df61e9c..4c797f6988 100644 --- a/src/quickcontrolsimpl/qquickmnemoniclabel_p.h +++ b/src/quickcontrolsimpl/qquickmnemoniclabel_p.h @@ -46,6 +46,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMnemonicLabel) - #endif // QQUICKMNEMONICLABEL_P_H diff --git a/src/quickcontrolsimpl/qquickninepatchimage_p.h b/src/quickcontrolsimpl/qquickninepatchimage_p.h index 0c5777bcfa..7ca5ae951e 100644 --- a/src/quickcontrolsimpl/qquickninepatchimage_p.h +++ b/src/quickcontrolsimpl/qquickninepatchimage_p.h @@ -70,6 +70,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickNinePatchImage) - #endif // QQUICKNINEPATCHIMAGE_P_H diff --git a/src/quickcontrolsimpl/qquickpaddedrectangle_p.h b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h index c7cec6fe52..812a87683c 100644 --- a/src/quickcontrolsimpl/qquickpaddedrectangle_p.h +++ b/src/quickcontrolsimpl/qquickpaddedrectangle_p.h @@ -83,6 +83,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPaddedRectangle) - #endif // QQUICKPADDEDRECTANGLE_P_H diff --git a/src/quickcontrolsimpl/qquickplaceholdertext_p.h b/src/quickcontrolsimpl/qquickplaceholdertext_p.h index 867ec24ad9..0fe18c63c1 100644 --- a/src/quickcontrolsimpl/qquickplaceholdertext_p.h +++ b/src/quickcontrolsimpl/qquickplaceholdertext_p.h @@ -40,6 +40,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPlaceholderText) - #endif // QQUICKPLACEHOLDERTEXT_P_H diff --git a/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h index f1d046eb89..2d9272da6e 100644 --- a/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickabstractdialog_p.h @@ -124,6 +124,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAbstractDialog) - #endif // QQUICKABSTRACTDIALOG_P_H diff --git a/src/quickdialogs/quickdialogs/qquickcolordialog_p.h b/src/quickdialogs/quickdialogs/qquickcolordialog_p.h index 9b424d6b7e..f0d981a3f8 100644 --- a/src/quickdialogs/quickdialogs/qquickcolordialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickcolordialog_p.h @@ -56,6 +56,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickColorDialog) - #endif // QQUICKCOLORDIALOG_P_H diff --git a/src/quickdialogs/quickdialogs/qquickfiledialog_p.h b/src/quickdialogs/quickdialogs/qquickfiledialog_p.h index 7214c907f3..b8b10ac86b 100644 --- a/src/quickdialogs/quickdialogs/qquickfiledialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickfiledialog_p.h @@ -127,6 +127,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFileDialog) - #endif // QQUICKFILEDIALOG_P_H diff --git a/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h b/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h index e1231ab3a5..97ad4f8040 100644 --- a/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickfolderdialog_p.h @@ -75,6 +75,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFolderDialog) - #endif // QQUICKFOLDERDIALOG_P_H diff --git a/src/quickdialogs/quickdialogs/qquickfontdialog_p.h b/src/quickdialogs/quickdialogs/qquickfontdialog_p.h index f5df6d2a9f..bc6a1b5396 100644 --- a/src/quickdialogs/quickdialogs/qquickfontdialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickfontdialog_p.h @@ -62,6 +62,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFontDialog) - #endif // QQUICKFONTDIALOG_P_H diff --git a/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h b/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h index 40a2b6da8d..84840e5d40 100644 --- a/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h +++ b/src/quickdialogs/quickdialogs/qquickmessagedialog_p.h @@ -70,6 +70,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMessageDialog) - #endif // QQUICKMESSAGEDIALOG_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h index 110298b5f2..7dfd32974e 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p.h @@ -145,6 +145,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickColorDialogImpl) - #endif // QQUICKCOLORDIALOGIMPL_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h index 36804497d7..a73c651c30 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogdelegate_p.h @@ -55,6 +55,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFileDialogDelegate) - #endif // QQUICKFILEDIALOGDELEGATE_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h index 4c64c5e4dd..616be4ee80 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p.h @@ -151,6 +151,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFileDialogImpl) - #endif // QQUICKFILEDIALOGIMPL_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h index d210112b33..636a9d8730 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderbreadcrumbbar_p.h @@ -89,6 +89,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFolderBreadcrumbBar) - #endif // QQUICKFOLDERBREADCRUMBBAR_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h index 021ef5479a..3f40660354 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p.h @@ -95,6 +95,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFolderDialogImpl) - #endif // QQUICKFOLDERDIALOGIMPL_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h index 6c30eb2474..ed811bdc79 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p.h @@ -178,6 +178,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFontDialogImpl) - #endif // QQUICKFONTDIALOGIMPL_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h index c7871b8d11..760755807d 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p.h @@ -93,6 +93,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMessageDialogImpl) - #endif // QQUICKMESSAGEDIALOGIMPL_P_H diff --git a/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h index 1263e9173f..67f3d48136 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquicksaturationlightnesspicker_p.h @@ -41,6 +41,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSaturationLightnessPicker) - #endif // QQUICKSATURATIONLIGHTNESSPICKER_P_H diff --git a/src/quicklayouts/qquicklayout_p.h b/src/quicklayouts/qquicklayout_p.h index bced440e4c..2b08f1bc32 100644 --- a/src/quicklayouts/qquicklayout_p.h +++ b/src/quicklayouts/qquicklayout_p.h @@ -379,6 +379,4 @@ inline QQuickLayoutAttached *attachedLayoutObject(QQuickItem *item, bool create QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLayout) - #endif // QQUICKLAYOUT_P_H diff --git a/src/quicknativestyle/items/qquickstyleitem.h b/src/quicknativestyle/items/qquickstyleitem.h index 08ba772efe..3d04371b7e 100644 --- a/src/quicknativestyle/items/qquickstyleitem.h +++ b/src/quicknativestyle/items/qquickstyleitem.h @@ -276,6 +276,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickStyleItem::DebugFlags) QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStyleItem) - #endif // QQUICKSTYLEITEM_H diff --git a/src/quickshapes/qquickshape_p.h b/src/quickshapes/qquickshape_p.h index eaee768fbd..0fbf5e732c 100644 --- a/src/quickshapes/qquickshape_p.h +++ b/src/quickshapes/qquickshape_p.h @@ -404,6 +404,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickShape) - #endif // QQUICKSHAPE_P_H diff --git a/src/quicktemplates/qquickabstractbutton_p.h b/src/quicktemplates/qquickabstractbutton_p.h index 8907cfefd8..0ba23c55e4 100644 --- a/src/quicktemplates/qquickabstractbutton_p.h +++ b/src/quicktemplates/qquickabstractbutton_p.h @@ -188,6 +188,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAbstractButton) - #endif // QQUICKABSTRACTBUTTON_P_H diff --git a/src/quicktemplates/qquickaction_p.h b/src/quicktemplates/qquickaction_p.h index c4dd818af6..975068687f 100644 --- a/src/quicktemplates/qquickaction_p.h +++ b/src/quicktemplates/qquickaction_p.h @@ -92,6 +92,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickAction) - #endif // QQUICKACTION_P_H diff --git a/src/quicktemplates/qquickactiongroup_p.h b/src/quicktemplates/qquickactiongroup_p.h index 2cd8edbe77..5b80cca6e3 100644 --- a/src/quicktemplates/qquickactiongroup_p.h +++ b/src/quicktemplates/qquickactiongroup_p.h @@ -94,6 +94,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickActionGroup) - #endif // QQUICKACTIONGROUP_P_H diff --git a/src/quicktemplates/qquickapplicationwindow_p.h b/src/quicktemplates/qquickapplicationwindow_p.h index 5d46b508e4..a877642111 100644 --- a/src/quicktemplates/qquickapplicationwindow_p.h +++ b/src/quicktemplates/qquickapplicationwindow_p.h @@ -135,6 +135,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickApplicationWindow) - #endif // QQUICKAPPLICATIONWINDOW_P_H diff --git a/src/quicktemplates/qquickbusyindicator_p.h b/src/quicktemplates/qquickbusyindicator_p.h index 46206b7d78..a122284b19 100644 --- a/src/quicktemplates/qquickbusyindicator_p.h +++ b/src/quicktemplates/qquickbusyindicator_p.h @@ -53,6 +53,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickBusyIndicator) - #endif // QQUICKBUSYINDICATOR_P_H diff --git a/src/quicktemplates/qquickbutton_p.h b/src/quicktemplates/qquickbutton_p.h index 1092274ee6..65b33bac3c 100644 --- a/src/quicktemplates/qquickbutton_p.h +++ b/src/quicktemplates/qquickbutton_p.h @@ -54,6 +54,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickButton) - #endif // QQUICKBUTTON_P_H diff --git a/src/quicktemplates/qquickbuttongroup_p.h b/src/quicktemplates/qquickbuttongroup_p.h index 6bdd619c1c..5cd28c4205 100644 --- a/src/quicktemplates/qquickbuttongroup_p.h +++ b/src/quicktemplates/qquickbuttongroup_p.h @@ -105,6 +105,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickButtonGroup) - #endif // QQUICKBUTTONGROUP_P_H diff --git a/src/quicktemplates/qquickcalendar_p.h b/src/quicktemplates/qquickcalendar_p.h index 37dac5595a..dbee98a737 100644 --- a/src/quicktemplates/qquickcalendar_p.h +++ b/src/quicktemplates/qquickcalendar_p.h @@ -50,6 +50,4 @@ public: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCalendar) - #endif // QQUICKCALENDAR_P_H diff --git a/src/quicktemplates/qquickcalendarmodel_p.h b/src/quicktemplates/qquickcalendarmodel_p.h index da0e226616..face2b29cf 100644 --- a/src/quicktemplates/qquickcalendarmodel_p.h +++ b/src/quicktemplates/qquickcalendarmodel_p.h @@ -74,6 +74,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCalendarModel) - #endif // QQUICKCALENDARMODEL_P_H diff --git a/src/quicktemplates/qquickcheckbox_p.h b/src/quicktemplates/qquickcheckbox_p.h index bfeb78ada3..3d36379bce 100644 --- a/src/quicktemplates/qquickcheckbox_p.h +++ b/src/quicktemplates/qquickcheckbox_p.h @@ -62,6 +62,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCheckBox) - #endif // QQUICKCHECKBOX_P_H diff --git a/src/quicktemplates/qquickcheckdelegate_p.h b/src/quicktemplates/qquickcheckdelegate_p.h index 8c7c3e8c74..220761dce1 100644 --- a/src/quicktemplates/qquickcheckdelegate_p.h +++ b/src/quicktemplates/qquickcheckdelegate_p.h @@ -63,6 +63,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickCheckDelegate) - #endif // QQUICKCHECKDELEGATE_P_H diff --git a/src/quicktemplates/qquickcombobox_p.h b/src/quicktemplates/qquickcombobox_p.h index af828822bb..874460c188 100644 --- a/src/quicktemplates/qquickcombobox_p.h +++ b/src/quicktemplates/qquickcombobox_p.h @@ -243,6 +243,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickComboBox) - #endif // QQUICKCOMBOBOX_P_H diff --git a/src/quicktemplates/qquickcontainer_p.h b/src/quicktemplates/qquickcontainer_p.h index b60c3ec112..51bfaf6e7c 100644 --- a/src/quicktemplates/qquickcontainer_p.h +++ b/src/quicktemplates/qquickcontainer_p.h @@ -105,6 +105,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickContainer) - #endif // QQUICKCONTAINER_P_H diff --git a/src/quicktemplates/qquickcontrol_p.h b/src/quicktemplates/qquickcontrol_p.h index d093f0f78a..1503866a00 100644 --- a/src/quicktemplates/qquickcontrol_p.h +++ b/src/quicktemplates/qquickcontrol_p.h @@ -258,6 +258,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickControl) - #endif // QQUICKCONTROL_P_H diff --git a/src/quicktemplates/qquickdayofweekmodel_p.h b/src/quicktemplates/qquickdayofweekmodel_p.h index ba80a43077..f3df4edab8 100644 --- a/src/quicktemplates/qquickdayofweekmodel_p.h +++ b/src/quicktemplates/qquickdayofweekmodel_p.h @@ -59,6 +59,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDayOfWeekModel) - #endif // QQUICKDAYOFWEEKMODEL_P_H diff --git a/src/quicktemplates/qquickdayofweekrow_p.h b/src/quicktemplates/qquickdayofweekrow_p.h index 3b5c062196..7c2a2398fe 100644 --- a/src/quicktemplates/qquickdayofweekrow_p.h +++ b/src/quicktemplates/qquickdayofweekrow_p.h @@ -56,6 +56,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDayOfWeekRow) - #endif // QQUICKDAYOFWEEKROW_P_H diff --git a/src/quicktemplates/qquickdelaybutton_p.h b/src/quicktemplates/qquickdelaybutton_p.h index ea8a8b6720..d082542007 100644 --- a/src/quicktemplates/qquickdelaybutton_p.h +++ b/src/quicktemplates/qquickdelaybutton_p.h @@ -62,6 +62,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDelayButton) - #endif // QQUICKDELAYBUTTON_P_H diff --git a/src/quicktemplates/qquickdial_p.h b/src/quicktemplates/qquickdial_p.h index 6662244e38..e80a8c813f 100644 --- a/src/quicktemplates/qquickdial_p.h +++ b/src/quicktemplates/qquickdial_p.h @@ -162,6 +162,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDial) - #endif // QQUICKDIAL_P_H diff --git a/src/quicktemplates/qquickdialog_p.h b/src/quicktemplates/qquickdialog_p.h index f31f6c0866..3c1a2dc5fe 100644 --- a/src/quicktemplates/qquickdialog_p.h +++ b/src/quicktemplates/qquickdialog_p.h @@ -113,6 +113,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDialog) - #endif // QQUICKDIALOG_P_H diff --git a/src/quicktemplates/qquickdialogbuttonbox_p.h b/src/quicktemplates/qquickdialogbuttonbox_p.h index 161be1bfda..570dc3fef9 100644 --- a/src/quicktemplates/qquickdialogbuttonbox_p.h +++ b/src/quicktemplates/qquickdialogbuttonbox_p.h @@ -132,6 +132,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDialogButtonBox) - #endif // QQUICKDIALOGBUTTONBOX_P_H diff --git a/src/quicktemplates/qquickdrawer_p.h b/src/quicktemplates/qquickdrawer_p.h index ec42117f20..411a7f8d24 100644 --- a/src/quicktemplates/qquickdrawer_p.h +++ b/src/quicktemplates/qquickdrawer_p.h @@ -73,6 +73,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickDrawer) - #endif // QQUICKDRAWER_P_H diff --git a/src/quicktemplates/qquickframe_p.h b/src/quicktemplates/qquickframe_p.h index 94c98685f4..0c24907476 100644 --- a/src/quicktemplates/qquickframe_p.h +++ b/src/quicktemplates/qquickframe_p.h @@ -44,6 +44,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFrame) - #endif // QQUICKFRAME_P_H diff --git a/src/quicktemplates/qquickgroupbox_p.h b/src/quicktemplates/qquickgroupbox_p.h index 5fc6284fea..8c73dcc8dd 100644 --- a/src/quicktemplates/qquickgroupbox_p.h +++ b/src/quicktemplates/qquickgroupbox_p.h @@ -71,6 +71,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickGroupBox) - #endif // QQUICKGROUPBOX_P_H diff --git a/src/quicktemplates/qquickheaderview_p.h b/src/quicktemplates/qquickheaderview_p.h index 14c89561c7..8ff68a9c0b 100644 --- a/src/quicktemplates/qquickheaderview_p.h +++ b/src/quicktemplates/qquickheaderview_p.h @@ -87,7 +87,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickHorizontalHeaderView) -QML_DECLARE_TYPE(QQuickVerticalHeaderView) - #endif // QQUICKHEADERVIEW_P_H diff --git a/src/quicktemplates/qquickitemdelegate_p.h b/src/quicktemplates/qquickitemdelegate_p.h index 4716edc849..db58590d9b 100644 --- a/src/quicktemplates/qquickitemdelegate_p.h +++ b/src/quicktemplates/qquickitemdelegate_p.h @@ -54,6 +54,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickItemDelegate) - #endif // QQUICKITEMDELEGATE_P_H diff --git a/src/quicktemplates/qquicklabel_p.h b/src/quicktemplates/qquicklabel_p.h index 66807461ae..08939ab80e 100644 --- a/src/quicktemplates/qquicklabel_p.h +++ b/src/quicktemplates/qquicklabel_p.h @@ -95,6 +95,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickLabel) - #endif // QQUICKLABEL_P_H diff --git a/src/quicktemplates/qquickmenu_p.h b/src/quicktemplates/qquickmenu_p.h index 60f8597886..abbe4ad6c2 100644 --- a/src/quicktemplates/qquickmenu_p.h +++ b/src/quicktemplates/qquickmenu_p.h @@ -136,6 +136,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMenu) - #endif // QQUICKMENU_P_H diff --git a/src/quicktemplates/qquickmenubar_p.h b/src/quicktemplates/qquickmenubar_p.h index e591ac3853..e00da0d7c0 100644 --- a/src/quicktemplates/qquickmenubar_p.h +++ b/src/quicktemplates/qquickmenubar_p.h @@ -74,6 +74,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMenuBar) - #endif // QQUICKMENUBAR_P_H diff --git a/src/quicktemplates/qquickmenubaritem_p.h b/src/quicktemplates/qquickmenubaritem_p.h index 0cb2977877..128fb50cce 100644 --- a/src/quicktemplates/qquickmenubaritem_p.h +++ b/src/quicktemplates/qquickmenubaritem_p.h @@ -71,6 +71,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMenuBarItem) - #endif // QQUICKMENUBARITEM_P_H diff --git a/src/quicktemplates/qquickmenuitem_p.h b/src/quicktemplates/qquickmenuitem_p.h index 280ff566af..2586ee8c3c 100644 --- a/src/quicktemplates/qquickmenuitem_p.h +++ b/src/quicktemplates/qquickmenuitem_p.h @@ -74,6 +74,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMenuItem) - #endif // QQUICKMENUITEM_P_H diff --git a/src/quicktemplates/qquickmenuseparator_p.h b/src/quicktemplates/qquickmenuseparator_p.h index abf3221461..e62753b1c2 100644 --- a/src/quicktemplates/qquickmenuseparator_p.h +++ b/src/quicktemplates/qquickmenuseparator_p.h @@ -44,6 +44,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMenuSeparator) - #endif // QQUICKMENUSEPARATOR_P_H diff --git a/src/quicktemplates/qquickmonthgrid_p.h b/src/quicktemplates/qquickmonthgrid_p.h index 35da6b2493..e7e4421e50 100644 --- a/src/quicktemplates/qquickmonthgrid_p.h +++ b/src/quicktemplates/qquickmonthgrid_p.h @@ -79,6 +79,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMonthGrid) - #endif // QQUICKMONTHGRID_P_H diff --git a/src/quicktemplates/qquickmonthmodel_p.h b/src/quicktemplates/qquickmonthmodel_p.h index bc05b0469a..e629a7f8d1 100644 --- a/src/quicktemplates/qquickmonthmodel_p.h +++ b/src/quicktemplates/qquickmonthmodel_p.h @@ -78,6 +78,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickMonthModel) - #endif // QQUICKMONTHMODEL_P_H diff --git a/src/quicktemplates/qquickoverlay_p.h b/src/quicktemplates/qquickoverlay_p.h index 47f7e62615..690afe8d90 100644 --- a/src/quicktemplates/qquickoverlay_p.h +++ b/src/quicktemplates/qquickoverlay_p.h @@ -108,6 +108,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickOverlay) - #endif // QQUICKOVERLAY_P_H diff --git a/src/quicktemplates/qquickpage_p.h b/src/quicktemplates/qquickpage_p.h index b7ce7e9bc9..de9edb613d 100644 --- a/src/quicktemplates/qquickpage_p.h +++ b/src/quicktemplates/qquickpage_p.h @@ -85,6 +85,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPage) - #endif // QQUICKPAGE_P_H diff --git a/src/quicktemplates/qquickpageindicator_p.h b/src/quicktemplates/qquickpageindicator_p.h index 9d91e12479..e5743d2694 100644 --- a/src/quicktemplates/qquickpageindicator_p.h +++ b/src/quicktemplates/qquickpageindicator_p.h @@ -72,6 +72,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPageIndicator) - #endif // QQUICKPAGEINDICATOR_P_H diff --git a/src/quicktemplates/qquickpane_p.h b/src/quicktemplates/qquickpane_p.h index d059e629d4..3ba14d59bb 100644 --- a/src/quicktemplates/qquickpane_p.h +++ b/src/quicktemplates/qquickpane_p.h @@ -69,6 +69,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPane) - #endif // QQUICKPANE_P_H diff --git a/src/quicktemplates/qquickpopup_p.h b/src/quicktemplates/qquickpopup_p.h index 7552b549bd..663b2b658b 100644 --- a/src/quicktemplates/qquickpopup_p.h +++ b/src/quicktemplates/qquickpopup_p.h @@ -444,6 +444,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPopup::ClosePolicy) QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPopup) - #endif // QQUICKPOPUP_P_H diff --git a/src/quicktemplates/qquickpopupanchors_p.h b/src/quicktemplates/qquickpopupanchors_p.h index fd76e9c237..2b1524c1fc 100644 --- a/src/quicktemplates/qquickpopupanchors_p.h +++ b/src/quicktemplates/qquickpopupanchors_p.h @@ -53,6 +53,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickPopupAnchors) - #endif // QQUICKPOPUPANCHORS_P_H diff --git a/src/quicktemplates/qquickprogressbar_p.h b/src/quicktemplates/qquickprogressbar_p.h index 99e356b525..3c7975a6e3 100644 --- a/src/quicktemplates/qquickprogressbar_p.h +++ b/src/quicktemplates/qquickprogressbar_p.h @@ -74,6 +74,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickProgressBar) - #endif // QQUICKPROGRESSBAR_P_H diff --git a/src/quicktemplates/qquickradiobutton_p.h b/src/quicktemplates/qquickradiobutton_p.h index 8d70290270..105a2d68ce 100644 --- a/src/quicktemplates/qquickradiobutton_p.h +++ b/src/quicktemplates/qquickradiobutton_p.h @@ -41,6 +41,4 @@ protected: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRadioButton) - #endif // QQUICKRADIOBUTTON_P_H diff --git a/src/quicktemplates/qquickradiodelegate_p.h b/src/quicktemplates/qquickradiodelegate_p.h index 574c87032c..1819e8ea0e 100644 --- a/src/quicktemplates/qquickradiodelegate_p.h +++ b/src/quicktemplates/qquickradiodelegate_p.h @@ -43,6 +43,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRadioDelegate) - #endif // QQUICKRADIODELEGATE_P_H diff --git a/src/quicktemplates/qquickrangeslider_p.h b/src/quicktemplates/qquickrangeslider_p.h index 577bbe165f..2064542292 100644 --- a/src/quicktemplates/qquickrangeslider_p.h +++ b/src/quicktemplates/qquickrangeslider_p.h @@ -191,6 +191,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRangeSlider) - #endif // QQUICKRANGESLIDER_P_H diff --git a/src/quicktemplates/qquickroundbutton_p.h b/src/quicktemplates/qquickroundbutton_p.h index bf589b673e..1e30ea78bc 100644 --- a/src/quicktemplates/qquickroundbutton_p.h +++ b/src/quicktemplates/qquickroundbutton_p.h @@ -48,6 +48,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickRoundButton) - #endif // QQUICKROUNDBUTTON_P_H diff --git a/src/quicktemplates/qquickscrollbar_p.h b/src/quicktemplates/qquickscrollbar_p.h index 6e4eade1f8..f5cfd91034 100644 --- a/src/quicktemplates/qquickscrollbar_p.h +++ b/src/quicktemplates/qquickscrollbar_p.h @@ -183,6 +183,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScrollBar) - #endif // QQUICKSCROLLBAR_P_H diff --git a/src/quicktemplates/qquickscrollindicator_p.h b/src/quicktemplates/qquickscrollindicator_p.h index 1af6407690..b3be953d73 100644 --- a/src/quicktemplates/qquickscrollindicator_p.h +++ b/src/quicktemplates/qquickscrollindicator_p.h @@ -123,6 +123,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScrollIndicator) - #endif // QQUICKSCROLLINDICATOR_P_H diff --git a/src/quicktemplates/qquickscrollview_p.h b/src/quicktemplates/qquickscrollview_p.h index ea4e1a0a78..73ade2675a 100644 --- a/src/quicktemplates/qquickscrollview_p.h +++ b/src/quicktemplates/qquickscrollview_p.h @@ -60,6 +60,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickScrollView) - #endif // QQUICKSCROLLVIEW_P_H diff --git a/src/quicktemplates/qquickselectionrectangle_p.h b/src/quicktemplates/qquickselectionrectangle_p.h index e380d40bcb..ad8eb1a917 100644 --- a/src/quicktemplates/qquickselectionrectangle_p.h +++ b/src/quicktemplates/qquickselectionrectangle_p.h @@ -107,6 +107,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSelectionRectangle) - #endif // QQUICKSELECTIONRECTANGLE_P_H diff --git a/src/quicktemplates/qquickslider_p.h b/src/quicktemplates/qquickslider_p.h index 8452d4dad9..ba0b01677d 100644 --- a/src/quicktemplates/qquickslider_p.h +++ b/src/quicktemplates/qquickslider_p.h @@ -152,6 +152,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSlider) - #endif // QQUICKSLIDER_P_H diff --git a/src/quicktemplates/qquickspinbox_p.h b/src/quicktemplates/qquickspinbox_p.h index a6145cb08f..8acf004ce1 100644 --- a/src/quicktemplates/qquickspinbox_p.h +++ b/src/quicktemplates/qquickspinbox_p.h @@ -157,6 +157,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSpinBox) - #endif // QQUICKSPINBOX_P_H diff --git a/src/quicktemplates/qquicksplitview_p.h b/src/quicktemplates/qquicksplitview_p.h index feb89e01e4..2ce59b9d53 100644 --- a/src/quicktemplates/qquicksplitview_p.h +++ b/src/quicktemplates/qquicksplitview_p.h @@ -187,8 +187,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSplitView) - -QML_DECLARE_TYPE(QQuickSplitHandleAttached) - #endif // QQUICKSPLITVIEW_P_H diff --git a/src/quicktemplates/qquickstackview_p.h b/src/quicktemplates/qquickstackview_p.h index eb9c2b033d..b2ece576cf 100644 --- a/src/quicktemplates/qquickstackview_p.h +++ b/src/quicktemplates/qquickstackview_p.h @@ -249,6 +249,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickStackView) - #endif // QQUICKSTACKVIEW_P_H diff --git a/src/quicktemplates/qquickswipedelegate_p.h b/src/quicktemplates/qquickswipedelegate_p.h index 2fadabe09f..576988acb0 100644 --- a/src/quicktemplates/qquickswipedelegate_p.h +++ b/src/quicktemplates/qquickswipedelegate_p.h @@ -86,7 +86,6 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSwipeDelegate) Q_DECLARE_METATYPE(QQuickSwipeDelegate::Side) #endif // QQUICKSWIPEDELEGATE_P_H diff --git a/src/quicktemplates/qquickswipeview_p.h b/src/quicktemplates/qquickswipeview_p.h index fe515685c7..5e91daa994 100644 --- a/src/quicktemplates/qquickswipeview_p.h +++ b/src/quicktemplates/qquickswipeview_p.h @@ -115,6 +115,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSwipeView) - #endif // QQUICKSWIPEVIEW_P_H diff --git a/src/quicktemplates/qquickswitch_p.h b/src/quicktemplates/qquickswitch_p.h index 9044b066b9..9c883d1535 100644 --- a/src/quicktemplates/qquickswitch_p.h +++ b/src/quicktemplates/qquickswitch_p.h @@ -61,6 +61,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSwitch) - #endif // QQUICKSWITCH_P_H diff --git a/src/quicktemplates/qquickswitchdelegate_p.h b/src/quicktemplates/qquickswitchdelegate_p.h index d6a6c830b3..de0cf412c2 100644 --- a/src/quicktemplates/qquickswitchdelegate_p.h +++ b/src/quicktemplates/qquickswitchdelegate_p.h @@ -61,6 +61,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickSwitchDelegate) - #endif // QQUICKSWITCHDELEGATE_P_H diff --git a/src/quicktemplates/qquicktabbar_p.h b/src/quicktemplates/qquicktabbar_p.h index fb669e4965..5934ea59fe 100644 --- a/src/quicktemplates/qquicktabbar_p.h +++ b/src/quicktemplates/qquicktabbar_p.h @@ -99,6 +99,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTabBar) - #endif // QQUICKTABBAR_P_H diff --git a/src/quicktemplates/qquicktabbutton_p.h b/src/quicktemplates/qquicktabbutton_p.h index 7b2fbdb2fe..431014e277 100644 --- a/src/quicktemplates/qquicktabbutton_p.h +++ b/src/quicktemplates/qquicktabbutton_p.h @@ -43,6 +43,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTabButton) - #endif // QQUICKTABBUTTON_P_H diff --git a/src/quicktemplates/qquicktextarea_p.h b/src/quicktemplates/qquicktextarea_p.h index 21ecad312f..4e4684a47f 100644 --- a/src/quicktemplates/qquicktextarea_p.h +++ b/src/quicktemplates/qquicktextarea_p.h @@ -176,6 +176,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextArea) - #endif // QQUICKTEXTAREA_P_H diff --git a/src/quicktemplates/qquicktextfield_p.h b/src/quicktemplates/qquicktextfield_p.h index f8e8e967fd..8fbf3da767 100644 --- a/src/quicktemplates/qquicktextfield_p.h +++ b/src/quicktemplates/qquicktextfield_p.h @@ -148,6 +148,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTextField) - #endif // QQUICKTEXTFIELD_P_H diff --git a/src/quicktemplates/qquicktoolbar_p.h b/src/quicktemplates/qquicktoolbar_p.h index f896361ea0..98c2858432 100644 --- a/src/quicktemplates/qquicktoolbar_p.h +++ b/src/quicktemplates/qquicktoolbar_p.h @@ -57,6 +57,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickToolBar) - #endif // QQUICKTOOLBAR_P_H diff --git a/src/quicktemplates/qquicktoolbutton_p.h b/src/quicktemplates/qquicktoolbutton_p.h index e470ae816d..fd3a83dd1a 100644 --- a/src/quicktemplates/qquicktoolbutton_p.h +++ b/src/quicktemplates/qquicktoolbutton_p.h @@ -39,6 +39,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickToolButton) - #endif // QQUICKTOOLBUTTON_P_H diff --git a/src/quicktemplates/qquicktoolseparator_p.h b/src/quicktemplates/qquicktoolseparator_p.h index 85930a3506..fb060b73a8 100644 --- a/src/quicktemplates/qquicktoolseparator_p.h +++ b/src/quicktemplates/qquicktoolseparator_p.h @@ -56,6 +56,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickToolSeparator) - #endif // QQUICKTOOLSEPARATOR_P_H diff --git a/src/quicktemplates/qquicktooltip_p.h b/src/quicktemplates/qquicktooltip_p.h index 979df38a31..9f49c85a7f 100644 --- a/src/quicktemplates/qquicktooltip_p.h +++ b/src/quicktemplates/qquicktooltip_p.h @@ -117,6 +117,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickToolTip) - #endif // QQUICKTOOLTIP_P_H diff --git a/src/quicktemplates/qquicktumbler_p.h b/src/quicktemplates/qquicktumbler_p.h index 02ea3049fd..52051c71a8 100644 --- a/src/quicktemplates/qquicktumbler_p.h +++ b/src/quicktemplates/qquicktumbler_p.h @@ -140,6 +140,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTumbler) - #endif // QQUICKTUMBLER_P_H diff --git a/src/quicktemplates/qquickweeknumbercolumn_p.h b/src/quicktemplates/qquickweeknumbercolumn_p.h index 7ea6255319..6db01a0923 100644 --- a/src/quicktemplates/qquickweeknumbercolumn_p.h +++ b/src/quicktemplates/qquickweeknumbercolumn_p.h @@ -66,6 +66,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWeekNumberColumn) - #endif // QQUICKWEEKNUMBERCOLUMN_P_H diff --git a/src/quicktemplates/qquickweeknumbermodel_p.h b/src/quicktemplates/qquickweeknumbermodel_p.h index f00fd5a073..ba12f2be16 100644 --- a/src/quicktemplates/qquickweeknumbermodel_p.h +++ b/src/quicktemplates/qquickweeknumbermodel_p.h @@ -67,6 +67,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickWeekNumberModel) - #endif // QQUICKWEEKNUMBERMODEL_P_H diff --git a/tools/qmltime/qmltime.h b/tools/qmltime/qmltime.h index 7812600456..fa0f44a5e4 100644 --- a/tools/qmltime/qmltime.h +++ b/tools/qmltime/qmltime.h @@ -38,6 +38,5 @@ private: QQuickView m_view; QQuickItem *m_item; }; -QML_DECLARE_TYPE(Timer); #endif // QMLTIME_H |