aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@theqtcompany.com>2015-07-27 14:15:51 +0200
committerMitch Curtis <mitch.curtis@theqtcompany.com>2015-07-27 13:10:33 +0000
commitd147f3ea83409edbeaa0ea58a5eb45c01e14dd56 (patch)
tree9ceabdb95faf5f7098118da89c349c2be42d5131 /src/controls
parent81d6b5d262da419f591adf66205e0456f588ba2c (diff)
Use Q_DECLARE_TYPEINFO for all classes.
This is following the advice in the mailing list: http://lists.qt-project.org/pipermail/development/2015-July/022283.html Change-Id: I900f68c0cc6979f413016bb177446a1e93b01bc5 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/controls')
-rw-r--r--src/controls/qquickabstractbutton_p.h2
-rw-r--r--src/controls/qquickabstractbutton_p_p.h2
-rw-r--r--src/controls/qquickapplicationwindow_p.h2
-rw-r--r--src/controls/qquickbusyindicator_p.h2
-rw-r--r--src/controls/qquickbutton_p.h2
-rw-r--r--src/controls/qquickcheckable_p.h2
-rw-r--r--src/controls/qquickcheckable_p_p.h2
-rw-r--r--src/controls/qquickcheckbox_p.h2
-rw-r--r--src/controls/qquickcontainer_p.h2
-rw-r--r--src/controls/qquickcontainer_p_p.h2
-rw-r--r--src/controls/qquickcontrol_p.h2
-rw-r--r--src/controls/qquickcontrol_p_p.h2
-rw-r--r--src/controls/qquickexclusivegroup_p.h2
-rw-r--r--src/controls/qquickframe_p.h2
-rw-r--r--src/controls/qquickframe_p_p.h2
-rw-r--r--src/controls/qquickgroupbox_p.h2
-rw-r--r--src/controls/qquicklabel_p.h2
-rw-r--r--src/controls/qquickpageindicator_p.h2
-rw-r--r--src/controls/qquickprogressbar_p.h2
-rw-r--r--src/controls/qquickradiobutton_p.h2
-rw-r--r--src/controls/qquickscrollbar_p.h4
-rw-r--r--src/controls/qquickscrollindicator_p.h4
-rw-r--r--src/controls/qquickslider_p.h2
-rw-r--r--src/controls/qquickstackview_p.h4
-rw-r--r--src/controls/qquickstackview_p_p.h4
-rw-r--r--src/controls/qquickswitch_p.h2
-rw-r--r--src/controls/qquicktabbar_p.h2
-rw-r--r--src/controls/qquicktabbutton_p.h2
-rw-r--r--src/controls/qquicktextarea_p.h2
-rw-r--r--src/controls/qquicktextfield_p.h2
-rw-r--r--src/controls/qquicktogglebutton_p.h2
-rw-r--r--src/controls/qquicktoolbar_p.h2
-rw-r--r--src/controls/qquicktoolbutton_p.h2
33 files changed, 74 insertions, 0 deletions
diff --git a/src/controls/qquickabstractbutton_p.h b/src/controls/qquickabstractbutton_p.h
index 071dfe67..ae0e34d9 100644
--- a/src/controls/qquickabstractbutton_p.h
+++ b/src/controls/qquickabstractbutton_p.h
@@ -98,6 +98,8 @@ private:
Q_DECLARE_PRIVATE(QQuickAbstractButton)
};
+Q_DECLARE_TYPEINFO(QQuickAbstractButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKABSTRACTBUTTON_P_H
diff --git a/src/controls/qquickabstractbutton_p_p.h b/src/controls/qquickabstractbutton_p_p.h
index 252a2863..4a24b4dd 100644
--- a/src/controls/qquickabstractbutton_p_p.h
+++ b/src/controls/qquickabstractbutton_p_p.h
@@ -64,6 +64,8 @@ public:
QQuickItem *label;
};
+Q_DECLARE_TYPEINFO(QQuickAbstractButtonPrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKABSTRACTBUTTON_P_P_H
diff --git a/src/controls/qquickapplicationwindow_p.h b/src/controls/qquickapplicationwindow_p.h
index 01aaa345..6acab50b 100644
--- a/src/controls/qquickapplicationwindow_p.h
+++ b/src/controls/qquickapplicationwindow_p.h
@@ -96,6 +96,8 @@ private:
QScopedPointer<QQuickApplicationWindowPrivate> d_ptr;
};
+Q_DECLARE_TYPEINFO(QQuickApplicationWindow, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKAPPLICATIONWINDOW_P_H
diff --git a/src/controls/qquickbusyindicator_p.h b/src/controls/qquickbusyindicator_p.h
index b0fcbb4c..a9a66853 100644
--- a/src/controls/qquickbusyindicator_p.h
+++ b/src/controls/qquickbusyindicator_p.h
@@ -78,6 +78,8 @@ private:
Q_DECLARE_PRIVATE(QQuickBusyIndicator)
};
+Q_DECLARE_TYPEINFO(QQuickBusyIndicator, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKBUSYINDICATOR_P_H
diff --git a/src/controls/qquickbutton_p.h b/src/controls/qquickbutton_p.h
index 3d0c5c46..b35ea97e 100644
--- a/src/controls/qquickbutton_p.h
+++ b/src/controls/qquickbutton_p.h
@@ -66,6 +66,8 @@ private:
Q_DECLARE_PRIVATE(QQuickButton)
};
+Q_DECLARE_TYPEINFO(QQuickButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKBUTTON_P_H
diff --git a/src/controls/qquickcheckable_p.h b/src/controls/qquickcheckable_p.h
index 20a6f88d..74f53946 100644
--- a/src/controls/qquickcheckable_p.h
+++ b/src/controls/qquickcheckable_p.h
@@ -90,6 +90,8 @@ private:
Q_DECLARE_PRIVATE(QQuickCheckable)
};
+Q_DECLARE_TYPEINFO(QQuickCheckable, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCHECKABLE_P_H
diff --git a/src/controls/qquickcheckable_p_p.h b/src/controls/qquickcheckable_p_p.h
index 709ee3fa..ef0d3f0a 100644
--- a/src/controls/qquickcheckable_p_p.h
+++ b/src/controls/qquickcheckable_p_p.h
@@ -62,6 +62,8 @@ public:
QQuickItem *indicator;
};
+Q_DECLARE_TYPEINFO(QQuickCheckablePrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCHECKABLE_P_P_H
diff --git a/src/controls/qquickcheckbox_p.h b/src/controls/qquickcheckbox_p.h
index 152695ba..a3998fd4 100644
--- a/src/controls/qquickcheckbox_p.h
+++ b/src/controls/qquickcheckbox_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickCheckBox(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickCheckBox, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCHECKBOX_P_H
diff --git a/src/controls/qquickcontainer_p.h b/src/controls/qquickcontainer_p.h
index 1f0875ee..22fa059a 100644
--- a/src/controls/qquickcontainer_p.h
+++ b/src/controls/qquickcontainer_p.h
@@ -93,6 +93,8 @@ private:
Q_DECLARE_PRIVATE(QQuickContainer)
};
+Q_DECLARE_TYPEINFO(QQuickContainer, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCONTAINER_P_H
diff --git a/src/controls/qquickcontainer_p_p.h b/src/controls/qquickcontainer_p_p.h
index b10486c5..fec72286 100644
--- a/src/controls/qquickcontainer_p_p.h
+++ b/src/controls/qquickcontainer_p_p.h
@@ -88,6 +88,8 @@ public:
QQmlObjectModel *contentModel;
};
+Q_DECLARE_TYPEINFO(QQuickContainerPrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCONTAINER_P_P_H
diff --git a/src/controls/qquickcontrol_p.h b/src/controls/qquickcontrol_p.h
index 1c9bee3c..9da4235e 100644
--- a/src/controls/qquickcontrol_p.h
+++ b/src/controls/qquickcontrol_p.h
@@ -146,6 +146,8 @@ private:
Q_DECLARE_PRIVATE(QQuickControl)
};
+Q_DECLARE_TYPEINFO(QQuickControl, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCONTROL_P_H
diff --git a/src/controls/qquickcontrol_p_p.h b/src/controls/qquickcontrol_p_p.h
index 93bfe22f..273ca6c9 100644
--- a/src/controls/qquickcontrol_p_p.h
+++ b/src/controls/qquickcontrol_p_p.h
@@ -84,6 +84,8 @@ public:
QQuickItem *contentItem;
};
+Q_DECLARE_TYPEINFO(QQuickControlPrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKCONTROL_P_P_H
diff --git a/src/controls/qquickexclusivegroup_p.h b/src/controls/qquickexclusivegroup_p.h
index 76cfd245..434425d0 100644
--- a/src/controls/qquickexclusivegroup_p.h
+++ b/src/controls/qquickexclusivegroup_p.h
@@ -104,6 +104,8 @@ private:
Q_DECLARE_PRIVATE(QQuickExclusiveGroupAttached)
};
+Q_DECLARE_TYPEINFO(QQuickExclusiveGroup, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
QML_DECLARE_TYPEINFO(QQuickExclusiveGroup, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/src/controls/qquickframe_p.h b/src/controls/qquickframe_p.h
index ed912c53..1f47ff30 100644
--- a/src/controls/qquickframe_p.h
+++ b/src/controls/qquickframe_p.h
@@ -96,6 +96,8 @@ private:
Q_DECLARE_PRIVATE(QQuickFrame)
};
+Q_DECLARE_TYPEINFO(QQuickFrame, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKFRAME_P_H
diff --git a/src/controls/qquickframe_p_p.h b/src/controls/qquickframe_p_p.h
index 60b0775f..02c4421b 100644
--- a/src/controls/qquickframe_p_p.h
+++ b/src/controls/qquickframe_p_p.h
@@ -62,6 +62,8 @@ public:
QQuickItem *frame;
};
+Q_DECLARE_TYPEINFO(QQuickFramePrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKFRAME_P_P_H
diff --git a/src/controls/qquickgroupbox_p.h b/src/controls/qquickgroupbox_p.h
index bae21a36..1934f655 100644
--- a/src/controls/qquickgroupbox_p.h
+++ b/src/controls/qquickgroupbox_p.h
@@ -78,6 +78,8 @@ private:
Q_DECLARE_PRIVATE(QQuickGroupBox)
};
+Q_DECLARE_TYPEINFO(QQuickGroupBox, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKGROUPBOX_P_H
diff --git a/src/controls/qquicklabel_p.h b/src/controls/qquicklabel_p.h
index 009372fd..7969810e 100644
--- a/src/controls/qquicklabel_p.h
+++ b/src/controls/qquicklabel_p.h
@@ -79,6 +79,8 @@ private:
QScopedPointer<QQuickLabelPrivate> d_ptr;
};
+Q_DECLARE_TYPEINFO(QQuickLabel, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKLABEL_P_H
diff --git a/src/controls/qquickpageindicator_p.h b/src/controls/qquickpageindicator_p.h
index 59b0e70f..3ac83bf0 100644
--- a/src/controls/qquickpageindicator_p.h
+++ b/src/controls/qquickpageindicator_p.h
@@ -89,6 +89,8 @@ private:
Q_DECLARE_PRIVATE(QQuickPageIndicator)
};
+Q_DECLARE_TYPEINFO(QQuickPageIndicator, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKPAGEINDICATOR_P_H
diff --git a/src/controls/qquickprogressbar_p.h b/src/controls/qquickprogressbar_p.h
index cf87e2cf..18f585a7 100644
--- a/src/controls/qquickprogressbar_p.h
+++ b/src/controls/qquickprogressbar_p.h
@@ -104,6 +104,8 @@ private:
Q_DECLARE_PRIVATE(QQuickProgressBar)
};
+Q_DECLARE_TYPEINFO(QQuickProgressBar, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKPROGRESSBAR_P_H
diff --git a/src/controls/qquickradiobutton_p.h b/src/controls/qquickradiobutton_p.h
index 5c5f76d7..fa61cc60 100644
--- a/src/controls/qquickradiobutton_p.h
+++ b/src/controls/qquickradiobutton_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickRadioButton(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickRadioButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKRADIOBUTTON_P_H
diff --git a/src/controls/qquickscrollbar_p.h b/src/controls/qquickscrollbar_p.h
index 9326ccd8..270b2757 100644
--- a/src/controls/qquickscrollbar_p.h
+++ b/src/controls/qquickscrollbar_p.h
@@ -110,6 +110,8 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollBar)
};
+Q_DECLARE_TYPEINFO(QQuickScrollBar, Q_COMPLEX_TYPE);
+
class QQuickScrollBarAttachedPrivate;
class Q_QUICKCONTROLS_EXPORT QQuickScrollBarAttached : public QObject
@@ -136,6 +138,8 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollBarAttached)
};
+Q_DECLARE_TYPEINFO(QQuickScrollBarAttached, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
QML_DECLARE_TYPEINFO(QQuickScrollBar, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/src/controls/qquickscrollindicator_p.h b/src/controls/qquickscrollindicator_p.h
index 8ffc40a2..e09f0376 100644
--- a/src/controls/qquickscrollindicator_p.h
+++ b/src/controls/qquickscrollindicator_p.h
@@ -98,6 +98,8 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollIndicator)
};
+Q_DECLARE_TYPEINFO(QQuickScrollIndicator, Q_COMPLEX_TYPE);
+
class QQuickScrollIndicatorAttachedPrivate;
class Q_QUICKCONTROLS_EXPORT QQuickScrollIndicatorAttached : public QObject
@@ -124,6 +126,8 @@ private:
Q_DECLARE_PRIVATE(QQuickScrollIndicatorAttached)
};
+Q_DECLARE_TYPEINFO(QQuickScrollIndicatorAttached, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
QML_DECLARE_TYPEINFO(QQuickScrollIndicator, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/src/controls/qquickslider_p.h b/src/controls/qquickslider_p.h
index 0e0f8e90..186ef029 100644
--- a/src/controls/qquickslider_p.h
+++ b/src/controls/qquickslider_p.h
@@ -141,6 +141,8 @@ private:
Q_DECLARE_PRIVATE(QQuickSlider)
};
+Q_DECLARE_TYPEINFO(QQuickSlider, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKSLIDER_P_H
diff --git a/src/controls/qquickstackview_p.h b/src/controls/qquickstackview_p.h
index f5180c08..9dd7280b 100644
--- a/src/controls/qquickstackview_p.h
+++ b/src/controls/qquickstackview_p.h
@@ -144,6 +144,8 @@ private:
Q_DECLARE_PRIVATE(QQuickStackView)
};
+Q_DECLARE_TYPEINFO(QQuickStackView, Q_COMPLEX_TYPE);
+
class QQuickStackAttachedPrivate;
class Q_QUICKCONTROLS_EXPORT QQuickStackAttached : public QObject
@@ -170,6 +172,8 @@ private:
Q_DECLARE_PRIVATE(QQuickStackAttached)
};
+Q_DECLARE_TYPEINFO(QQuickStackAttached, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
QML_DECLARE_TYPEINFO(QQuickStackView, QML_HAS_ATTACHED_PROPERTIES)
diff --git a/src/controls/qquickstackview_p_p.h b/src/controls/qquickstackview_p_p.h
index 857876e9..063ce17e 100644
--- a/src/controls/qquickstackview_p_p.h
+++ b/src/controls/qquickstackview_p_p.h
@@ -98,6 +98,8 @@ public:
QV4::PersistentValue qmlGlobal;
};
+Q_DECLARE_TYPEINFO(QQuickStackElement, Q_COMPLEX_TYPE);
+
class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener
{
Q_DECLARE_PUBLIC(QQuickStackView)
@@ -155,6 +157,8 @@ public:
QQuickStackElement *element;
};
+Q_DECLARE_TYPEINFO(QQuickStackViewPrivate, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKSTACKVIEW_P_P_H
diff --git a/src/controls/qquickswitch_p.h b/src/controls/qquickswitch_p.h
index 9c930967..b3a48c63 100644
--- a/src/controls/qquickswitch_p.h
+++ b/src/controls/qquickswitch_p.h
@@ -88,6 +88,8 @@ private:
Q_DECLARE_PRIVATE(QQuickSwitch)
};
+Q_DECLARE_TYPEINFO(QQuickSwitch, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKSWITCH_P_H
diff --git a/src/controls/qquicktabbar_p.h b/src/controls/qquicktabbar_p.h
index 4512b841..5307d477 100644
--- a/src/controls/qquicktabbar_p.h
+++ b/src/controls/qquicktabbar_p.h
@@ -83,6 +83,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTabBar)
};
+Q_DECLARE_TYPEINFO(QQuickTabBar, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTABBAR_P_H
diff --git a/src/controls/qquicktabbutton_p.h b/src/controls/qquicktabbutton_p.h
index e62d8f63..20761e31 100644
--- a/src/controls/qquicktabbutton_p.h
+++ b/src/controls/qquicktabbutton_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickTabButton(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickTabButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTABBUTTON_P_H
diff --git a/src/controls/qquicktextarea_p.h b/src/controls/qquicktextarea_p.h
index 0939797b..edf81942 100644
--- a/src/controls/qquicktextarea_p.h
+++ b/src/controls/qquicktextarea_p.h
@@ -85,6 +85,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTextArea)
};
+Q_DECLARE_TYPEINFO(QQuickTextArea, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTEXTAREA_P_H
diff --git a/src/controls/qquicktextfield_p.h b/src/controls/qquicktextfield_p.h
index 1cc7ffe4..a3b0fa8d 100644
--- a/src/controls/qquicktextfield_p.h
+++ b/src/controls/qquicktextfield_p.h
@@ -91,6 +91,8 @@ private:
Q_DECLARE_PRIVATE(QQuickTextField)
};
+Q_DECLARE_TYPEINFO(QQuickTextField, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTEXTFIELD_P_H
diff --git a/src/controls/qquicktogglebutton_p.h b/src/controls/qquicktogglebutton_p.h
index a315033e..5a4b377a 100644
--- a/src/controls/qquicktogglebutton_p.h
+++ b/src/controls/qquicktogglebutton_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickToggleButton(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickToggleButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTOGGLEBUTTON_P_H
diff --git a/src/controls/qquicktoolbar_p.h b/src/controls/qquicktoolbar_p.h
index 878ffe8c..3525c3df 100644
--- a/src/controls/qquicktoolbar_p.h
+++ b/src/controls/qquicktoolbar_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickToolBar(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickToolBar, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTOOLBAR_P_H
diff --git a/src/controls/qquicktoolbutton_p.h b/src/controls/qquicktoolbutton_p.h
index 6a814755..0eb323b0 100644
--- a/src/controls/qquicktoolbutton_p.h
+++ b/src/controls/qquicktoolbutton_p.h
@@ -60,6 +60,8 @@ public:
explicit QQuickToolButton(QQuickItem *parent = Q_NULLPTR);
};
+Q_DECLARE_TYPEINFO(QQuickToolButton, Q_COMPLEX_TYPE);
+
QT_END_NAMESPACE
#endif // QQUICKTOOLBUTTON_P_H