qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Q_DECLARE_TYPEINFO(T, Q_COMPLEX_TYPE) by QML_DECLARE_TYPE(T) 

Q_COMPLEX_TYPE tells Qt containers that the type has a ctor/dtor and
that it may not be moved in memory using memcpy(). QML types are never
stored by value in Qt containers (non-copyable QObjects), so the type
info declaration is superfluous. QML_DECLARE_TYPE, however, is useful
(QTBUG-49920) and consistently used for all QtQuick types.

Change-Id: I3bd1718b306fa7af85a623fa7a17e1b9653d2152
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
This commit is contained in:
J-P Nurmi 2015-12-20 19:58:55 +01:00
parent 1797cbcd83
commit a75e7c4c1f
63 changed files with 103 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controls/qquickpaddedrectangle_p.h
View File

@ -111,8 +111,8 @@ private:
bool m_hasBottomPadding;
};
Q_DECLARE_TYPEINFO(QQuickPaddedRectangle, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickPaddedRectangle)
#endif // QQUICKPADDEDRECTANGLE_P_H

5
src/imports/calendar/qquickcalendar_p.h
View File

@ -50,6 +50,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qdatetime.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -77,8 +78,8 @@ public:
Q_ENUM(Month)
};
Q_DECLARE_TYPEINFO(QQuickCalendar, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickCalendar)
#endif // QQUICKCALENDAR_P_H

5
src/imports/calendar/qquickcalendarmodel_p.h
View File

@ -51,6 +51,7 @@
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qdatetime.h>
#include <QtQml/qqmlparserstatus.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -101,8 +102,8 @@ private:
Q_DECLARE_PRIVATE(QQuickCalendarModel)
};
Q_DECLARE_TYPEINFO(QQuickCalendarModel, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickCalendarModel)
#endif // QQUICKCALENDARMODEL_P_H

5
src/imports/calendar/qquickdayofweekmodel_p.h
View File

@ -50,6 +50,7 @@
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qlocale.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -88,8 +89,8 @@ private:
Q_DECLARE_PRIVATE(QQuickDayOfWeekModel)
};
Q_DECLARE_TYPEINFO(QQuickDayOfWeekModel, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickDayOfWeekModel)
#endif // QQUICKDAYOFWEEKMODEL_P_H

4
src/imports/calendar/qquickdayofweekrow_p.h
View File

@ -85,8 +85,8 @@ private:
Q_DECLARE_PRIVATE(QQuickDayOfWeekRow)
};
Q_DECLARE_TYPEINFO(QQuickDayOfWeekRow, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickDayOfWeekRow)
#endif // QQUICKDAYOFWEEKROW_P_H

4
src/imports/calendar/qquickmonthgrid_p.h
View File

@ -112,8 +112,8 @@ private:
Q_DECLARE_PRIVATE(QQuickMonthGrid)
};
Q_DECLARE_TYPEINFO(QQuickMonthGrid, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickMonthGrid)
#endif // QQUICKMONTHGRID_P_H

5
src/imports/calendar/qquickmonthmodel_p.h
View File

@ -51,6 +51,7 @@
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qlocale.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -107,8 +108,8 @@ private:
Q_DECLARE_PRIVATE(QQuickMonthModel)
};
Q_DECLARE_TYPEINFO(QQuickMonthModel, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickMonthModel)
#endif // QQUICKMONTHMODEL_P_H

4
src/imports/calendar/qquickweeknumbercolumn_p.h
View File

@ -95,8 +95,8 @@ private:
Q_DECLARE_PRIVATE(QQuickWeekNumberColumn)
};
Q_DECLARE_TYPEINFO(QQuickWeekNumberColumn, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickWeekNumberColumn)
#endif // QQUICKWEEKNUMBERCOLUMN_P_H

5
src/imports/calendar/qquickweeknumbermodel_p.h
View File

@ -50,6 +50,7 @@
#include <QtCore/qabstractitemmodel.h>
#include <QtCore/qlocale.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -96,8 +97,8 @@ private:
Q_DECLARE_PRIVATE(QQuickWeekNumberModel)
};
Q_DECLARE_TYPEINFO(QQuickWeekNumberModel, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickWeekNumberModel)
#endif // QQUICKWEEKNUMBERMODEL_P_H

3
src/imports/controls/material/qquickmaterialprogressring.cpp
View File

@ -274,7 +274,4 @@ void QQuickMaterialRingTexture::setColor(QColor color)
m_color = color;
}
Q_DECLARE_TYPEINFO(QQuickMaterialRingAnimatorJob, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickMaterialRingTexture, Q_COMPLEX_TYPE);
QT_END_NAMESPACE

5
src/imports/controls/material/qquickmaterialprogressring_p.h
View File

@ -86,9 +86,8 @@ protected:
QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickMaterialProgressRing, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickMaterialRingAnimator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickMaterialProgressRing)
#endif // QQUICKMATERIALPROGRESSRING_P_H

5
src/imports/controls/qquickbusyindicatorring_p.h
View File

@ -75,9 +75,8 @@ protected:
QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickBusyIndicatorRing, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickBusyIndicatorAnimator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickBusyIndicatorRing)
#endif // QQUICKBUSYINDICATOR_P_H

2
src/imports/controls/universal/qquickuniversalimageprovider_p.h
View File

@ -60,8 +60,6 @@ public:
QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickUniversalImageProvider, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKUNIVERSALIMAGEPROVIDER_P_H

5
src/imports/controls/universal/qquickuniversalprogressring_p.h
View File

@ -92,9 +92,8 @@ protected:
QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickUniversalProgressRing, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickUniversalProgressRingAnimator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickUniversalProgressRing)
#endif // QQUICKUNIVERSALPROGRESSRING_P_H

6
src/imports/controls/universal/qquickuniversalprogressstrip_p.h
View File

@ -86,9 +86,9 @@ protected:
QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickUniversalProgressStrip, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickUniversalProgressStripAnimator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickUniversalProgressStrip)
QML_DECLARE_TYPE(QQuickUniversalProgressStripAnimator)
#endif // QQUICKUNIVERSALPROGRESSSTRIP_P_H

4
src/templates/qquickabstractbutton_p.h
View File

@ -144,8 +144,8 @@ private:
Q_DECLARE_PRIVATE(QQuickAbstractButton)
};
Q_DECLARE_TYPEINFO(QQuickAbstractButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickAbstractButton)
#endif // QQUICKABSTRACTBUTTON_P_H

2
src/templates/qquickabstractbutton_p_p.h
View File

@ -90,8 +90,6 @@ public:
QQuickButtonGroup *group;
};
Q_DECLARE_TYPEINFO(QQuickAbstractButtonPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKABSTRACTBUTTON_P_P_H

4
src/templates/qquickapplicationwindow_p.h
View File

@ -145,11 +145,9 @@ private:
Q_DECLARE_PRIVATE(QQuickApplicationWindowAttached)
};
Q_DECLARE_TYPEINFO(QQuickApplicationWindow, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickApplicationWindowAttached, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickApplicationWindow)
QML_DECLARE_TYPEINFO(QQuickApplicationWindow, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKAPPLICATIONWINDOW_P_H

4
src/templates/qquickbusyindicator_p.h
View File

@ -78,8 +78,8 @@ private:
Q_DECLARE_PRIVATE(QQuickBusyIndicator)
};
Q_DECLARE_TYPEINFO(QQuickBusyIndicator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickBusyIndicator)
#endif // QQUICKBUSYINDICATOR_P_H

4
src/templates/qquickbutton_p.h
View File

@ -63,8 +63,8 @@ protected:
QFont defaultFont() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickButton)
#endif // QQUICKBUTTON_P_H

3
src/templates/qquickbuttongroup_p.h
View File

@ -108,10 +108,9 @@ private:
Q_DECLARE_PRIVATE(QQuickButtonGroupAttached)
};
Q_DECLARE_TYPEINFO(QQuickButtonGroup, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickButtonGroup)
QML_DECLARE_TYPEINFO(QQuickButtonGroup, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQuickButtonGroup_H

4
src/templates/qquickcheckbox_p.h
View File

@ -88,8 +88,8 @@ private:
Q_DECLARE_PRIVATE(QQuickCheckBox)
};
Q_DECLARE_TYPEINFO(QQuickCheckBox, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickCheckBox)
#endif // QQUICKCHECKBOX_P_H

4
src/templates/qquickcombobox_p.h
View File

@ -139,8 +139,8 @@ private:
Q_DECLARE_PRIVATE(QQuickComboBox)
};
Q_DECLARE_TYPEINFO(QQuickComboBox, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickComboBox)
#endif // QQUICKCOMBOBOX_P_H

4
src/templates/qquickcontainer_p.h
View File

@ -109,8 +109,8 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_currentIndexChanged())
};
Q_DECLARE_TYPEINFO(QQuickContainer, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickContainer)
#endif // QQUICKCONTAINER_P_H

2
src/templates/qquickcontainer_p_p.h
View File

@ -92,8 +92,6 @@ public:
bool updatingCurrent;
};
Q_DECLARE_TYPEINFO(QQuickContainerPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKCONTAINER_P_P_H

4
src/templates/qquickcontrol_p.h
View File

@ -178,8 +178,8 @@ private:
Q_DECLARE_PRIVATE(QQuickControl)
};
Q_DECLARE_TYPEINFO(QQuickControl, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickControl)
#endif // QQUICKCONTROL_P_H

2
src/templates/qquickcontrol_p_p.h
View File

@ -121,8 +121,6 @@ public:
QQuickAccessibleAttached *accessibleAttached;
};
Q_DECLARE_TYPEINFO(QQuickControlPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKCONTROL_P_P_H

4
src/templates/qquickdial_p.h
View File

@ -140,8 +140,8 @@ private:
Q_DECLARE_PRIVATE(QQuickDial)
};
Q_DECLARE_TYPEINFO(QQuickDial, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickDial)
#endif // QQUICKDIAL_H

4
src/templates/qquickdrawer_p.h
View File

@ -107,8 +107,8 @@ private:
Q_DECLARE_PRIVATE(QQuickDrawer)
};
Q_DECLARE_TYPEINFO(QQuickDrawer, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickDrawer)
#endif // QQUICKDRAWER_P_H

4
src/templates/qquickframe_p.h
View File

@ -76,8 +76,8 @@ private:
Q_DECLARE_PRIVATE(QQuickFrame)
};
Q_DECLARE_TYPEINFO(QQuickFrame, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickFrame)
#endif // QQUICKFRAME_P_H

2
src/templates/qquickframe_p_p.h
View File

@ -64,8 +64,6 @@ public:
QQuickItem *frame;
};
Q_DECLARE_TYPEINFO(QQuickFramePrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKFRAME_P_P_H

4
src/templates/qquickgroupbox_p.h
View File

@ -81,8 +81,8 @@ private:
Q_DECLARE_PRIVATE(QQuickGroupBox)
};
Q_DECLARE_TYPEINFO(QQuickGroupBox, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickGroupBox)
#endif // QQUICKGROUPBOX_P_H

4
src/templates/qquickitemdelegate_p.h
View File

@ -71,8 +71,8 @@ private:
Q_DECLARE_PRIVATE(QQuickItemDelegate)
};
Q_DECLARE_TYPEINFO(QQuickItemDelegate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickItemDelegate)
#endif // QQUICKITEMDELEGATE_P_H

4
src/templates/qquicklabel_p.h
View File

@ -86,8 +86,8 @@ private:
Q_DECLARE_PRIVATE(QQuickLabel)
};
Q_DECLARE_TYPEINFO(QQuickLabel, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickLabel)
#endif // QQUICKLABEL_P_H

2
src/templates/qquicklabel_p_p.h
View File

@ -86,8 +86,6 @@ public:
QQuickAccessibleAttached *accessibleAttached;
};
Q_DECLARE_TYPEINFO(QQuickLabelPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKLABEL_P_P_H

5
src/templates/qquickmenu_p.h
View File

@ -49,6 +49,7 @@
//
#include <QtQml/qqmllist.h>
#include <QtQml/qqml.h>
#include "qquickpopup_p.h"
@ -84,8 +85,8 @@ private:
Q_DECLARE_PRIVATE(QQuickMenu)
};
Q_DECLARE_TYPEINFO(QQuickMenu, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickMenu)
#endif // QQUICKMENU_P_H

2
src/templates/qquickmenu_p_p.h
View File

@ -91,8 +91,6 @@ public:
bool ignoreActiveFocusChanges;
};
Q_DECLARE_TYPEINFO(QQuickMenuPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKMENU_P_P_H

4
src/templates/qquickmenuitem_p.h
View File

@ -76,8 +76,8 @@ private:
Q_DECLARE_PRIVATE(QQuickMenuItem)
};
Q_DECLARE_TYPEINFO(QQuickMenuItem, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickMenuItem)
#endif // QQUICKMENUITEM_P_H

2
src/templates/qquickoverlay_p.h
View File

@ -89,4 +89,6 @@ private:
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickOverlay)
#endif // QQUICKOVERLAY_P_H

4
src/templates/qquickpageindicator_p.h
View File

@ -101,8 +101,8 @@ private:
Q_DECLARE_PRIVATE(QQuickPageIndicator)
};
Q_DECLARE_TYPEINFO(QQuickPageIndicator, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickPageIndicator)
#endif // QQUICKPAGEINDICATOR_P_H

4
src/templates/qquickpane_p.h
View File

@ -95,8 +95,8 @@ private:
Q_DECLARE_PRIVATE(QQuickPane)
};
Q_DECLARE_TYPEINFO(QQuickPane, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickPane)
#endif // QQUICKPANE_P_H

2
src/templates/qquickpane_p_p.h
View File

@ -65,8 +65,6 @@ public:
qreal contentHeight;
};
Q_DECLARE_TYPEINFO(QQuickPanePrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKPANE_P_P_H

3
src/templates/qquickpopup_p.h
View File

@ -50,6 +50,7 @@
#include <QtCore/qobject.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -116,4 +117,6 @@ private:
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickPopup)
#endif // QQUICKPOPUP_P_H

4
src/templates/qquickprogressbar_p.h
View File

@ -108,8 +108,8 @@ private:
Q_DECLARE_PRIVATE(QQuickProgressBar)
};
Q_DECLARE_TYPEINFO(QQuickProgressBar, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickProgressBar)
#endif // QQUICKPROGRESSBAR_P_H

4
src/templates/qquickradiobutton_p.h
View File

@ -67,8 +67,8 @@ protected:
#endif
};
Q_DECLARE_TYPEINFO(QQuickRadioButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickRadioButton)
#endif // QQUICKRADIOBUTTON_P_H

6
src/templates/qquickrangeslider_p.h
View File

@ -129,8 +129,6 @@ private:
Q_DECLARE_PRIVATE(QQuickRangeSlider)
};
Q_DECLARE_TYPEINFO(QQuickRangeSlider, Q_COMPLEX_TYPE);
class QQuickRangeSliderNodePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickRangeSliderNode : public QObject
@ -174,8 +172,8 @@ private:
Q_DECLARE_PRIVATE(QQuickRangeSliderNode)
};
Q_DECLARE_TYPEINFO(QQuickRangeSliderNode, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickRangeSlider)
#endif // QQUICKRANGESLIDER_H

5
src/templates/qquickscrollbar_p.h
View File

@ -115,8 +115,6 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollBar)
};
Q_DECLARE_TYPEINFO(QQuickScrollBar, Q_COMPLEX_TYPE);
class QQuickScrollBarAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject
@ -144,10 +142,9 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollBarAttached)
};
Q_DECLARE_TYPEINFO(QQuickScrollBarAttached, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickScrollBar)
QML_DECLARE_TYPEINFO(QQuickScrollBar, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKSCROLLBAR_P_H

5
src/templates/qquickscrollindicator_p.h
View File

@ -103,8 +103,6 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollIndicator)
};
Q_DECLARE_TYPEINFO(QQuickScrollIndicator, Q_COMPLEX_TYPE);
class QQuickScrollIndicatorAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject
@ -132,10 +130,9 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollIndicatorAttached)
};
Q_DECLARE_TYPEINFO(QQuickScrollIndicatorAttached, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickScrollIndicator)
QML_DECLARE_TYPEINFO(QQuickScrollIndicator, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKSCROLLINDICATOR_P_H

4
src/templates/qquickslider_p.h
View File

@ -146,8 +146,8 @@ private:
Q_DECLARE_PRIVATE(QQuickSlider)
};
Q_DECLARE_TYPEINFO(QQuickSlider, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickSlider)
#endif // QQUICKSLIDER_P_H

5
src/templates/qquickspinbox_p.h
View File

@ -158,9 +158,8 @@ private:
Q_DECLARE_PRIVATE(QQuickSpinButton)
};
Q_DECLARE_TYPEINFO(QQuickSpinBox, Q_COMPLEX_TYPE);
Q_DECLARE_TYPEINFO(QQuickSpinButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickSpinBox)
#endif // QQUICKSPINBOX_P_H

6
src/templates/qquickstackview_p.h
View File

@ -154,8 +154,6 @@ private:
Q_DECLARE_PRIVATE(QQuickStackView)
};
Q_DECLARE_TYPEINFO(QQuickStackView, Q_COMPLEX_TYPE);
class QQuickStackAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject
@ -183,11 +181,9 @@ private:
Q_DECLARE_PRIVATE(QQuickStackAttached)
};
Q_DECLARE_TYPEINFO(QQuickStackAttached, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES)
QML_DECLARE_TYPE(QQuickStackView)
QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKSTACKVIEW_P_H

4
src/templates/qquickstackview_p_p.h
View File

@ -100,8 +100,6 @@ public:
QV4::PersistentValue properties;
};
Q_DECLARE_TYPEINFO(QQuickStackElement, Q_COMPLEX_TYPE);
class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener
{
Q_DECLARE_PUBLIC(QQuickStackView)
@ -159,8 +157,6 @@ public:
QQuickStackElement *element;
};
Q_DECLARE_TYPEINFO(QQuickStackViewPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKSTACKVIEW_P_P_H

3
src/templates/qquickswipeview_p.h
View File

@ -100,10 +100,9 @@ private:
Q_DECLARE_PRIVATE(QQuickSwipeViewAttached)
};
Q_DECLARE_TYPEINFO(QQuickSwipeView, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickSwipeView)
QML_DECLARE_TYPEINFO(QQuickSwipeView, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKSWIPEVIEW_P_H

4
src/templates/qquickswitch_p.h
View File

@ -83,8 +83,8 @@ private:
Q_DECLARE_PRIVATE(QQuickSwitch)
};
Q_DECLARE_TYPEINFO(QQuickSwitch, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickSwitch)
#endif // QQUICKSWITCH_P_H

4
src/templates/qquicktabbar_p.h
View File

@ -78,8 +78,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTabBar)
};
Q_DECLARE_TYPEINFO(QQuickTabBar, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickTabBar)
#endif // QQUICKTABBAR_P_H

4
src/templates/qquicktabbutton_p.h
View File

@ -67,8 +67,8 @@ protected:
#endif
};
Q_DECLARE_TYPEINFO(QQuickTabButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickTabButton)
#endif // QQUICKTABBUTTON_P_H

4
src/templates/qquicktextarea_p.h
View File

@ -111,8 +111,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTextArea)
};
Q_DECLARE_TYPEINFO(QQuickTextArea, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickTextArea)
#endif // QQUICKTEXTAREA_P_H

2
src/templates/qquicktextarea_p_p.h
View File

@ -98,8 +98,6 @@ public:
QQuickAccessibleAttached *accessibleAttached;
};
Q_DECLARE_TYPEINFO(QQuickTextAreaPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKTEXTAREA_P_P_H

4
src/templates/qquicktextfield_p.h
View File

@ -111,8 +111,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTextField)
};
Q_DECLARE_TYPEINFO(QQuickTextField, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickTextField)
#endif // QQUICKTEXTFIELD_P_H

2
src/templates/qquicktextfield_p_p.h
View File

@ -99,8 +99,6 @@ public:
QQuickAccessibleAttached *accessibleAttached;
};
Q_DECLARE_TYPEINFO(QQuickTextFieldPrivate, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
#endif // QQUICKTEXTFIELD_P_P_H

4
src/templates/qquicktoolbar_p.h
View File

@ -65,8 +65,8 @@ protected:
#endif
};
Q_DECLARE_TYPEINFO(QQuickToolBar, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickToolBar)
#endif // QQUICKTOOLBAR_P_H

4
src/templates/qquicktoolbutton_p.h
View File

@ -63,8 +63,8 @@ protected:
QFont defaultFont() const Q_DECL_OVERRIDE;
};
Q_DECLARE_TYPEINFO(QQuickToolButton, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickToolButton)
#endif // QQUICKTOOLBUTTON_P_H

5
src/templates/qquicktumbler_p.h
View File

@ -110,8 +110,6 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_updateItemHeights())
};
Q_DECLARE_TYPEINFO(QQuickTumbler, Q_COMPLEX_TYPE);
class QQuickTumblerAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickTumblerAttached : public QObject
@ -137,10 +135,9 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_calculateDisplacement())
};
Q_DECLARE_TYPEINFO(QQuickTumblerAttached, Q_COMPLEX_TYPE);
QT_END_NAMESPACE
QML_DECLARE_TYPE(QQuickTumbler)
QML_DECLARE_TYPEINFO(QQuickTumbler, QML_HAS_ATTACHED_PROPERTIES)
#endif // QQUICKTUMBLER_H