QtGui: sweep Q_DECLARE_METATYPE → QT_DECL_METATYPE_EXTERN [1/2]: public API
It's one of our best tools to improve compile times. Can't backport to Qt 6.3 or 6.2 because this change introduces new exported symbols. Task-number: QTBUG-102206 Change-Id: Ib8224ed60afa893744f369fe7394d27e89b66c11 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>bb10
Marc Mutz
parent
2d85244802
commit
53327f5751
|
|
@ -56,6 +56,11 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPlatformDialogHelper::StandardButton,
|
||||
QPlatformDialogHelper__StandardButton)
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPlatformDialogHelper::ButtonRole,
|
||||
QPlatformDialogHelper__ButtonRole)
|
||||
|
||||
/*!
|
||||
\class QPlatformDialogHelper
|
||||
\since 5.0
|
||||
|
|
|
|||
|
|
@ -176,8 +176,10 @@ Q_SIGNALS:
|
|||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
Q_DECLARE_METATYPE(QPlatformDialogHelper::StandardButton)
|
||||
Q_DECLARE_METATYPE(QPlatformDialogHelper::ButtonRole)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPlatformDialogHelper::StandardButton,
|
||||
QPlatformDialogHelper__StandardButton, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPlatformDialogHelper::ButtonRole,
|
||||
QPlatformDialogHelper__ButtonRole, Q_GUI_EXPORT)
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class Q_GUI_EXPORT QColorDialogOptions
|
||||
|
|
|
|||
|
|
@ -41,6 +41,15 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix2x2)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix2x3)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix2x4)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix3x2)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix3x3)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix3x4)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix4x2)
|
||||
QT_IMPL_METATYPE_EXTERN(QMatrix4x3)
|
||||
|
||||
/*!
|
||||
\class QGenericMatrix
|
||||
\brief The QGenericMatrix class is a template class that represents a NxM transformation matrix with N columns and M rows.
|
||||
|
|
|
|||
|
|
@ -381,13 +381,13 @@ QDataStream &operator>>(QDataStream &stream, QGenericMatrix<N, M, T> &matrix)
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QMatrix2x2)
|
||||
Q_DECLARE_METATYPE(QMatrix2x3)
|
||||
Q_DECLARE_METATYPE(QMatrix2x4)
|
||||
Q_DECLARE_METATYPE(QMatrix3x2)
|
||||
Q_DECLARE_METATYPE(QMatrix3x3)
|
||||
Q_DECLARE_METATYPE(QMatrix3x4)
|
||||
Q_DECLARE_METATYPE(QMatrix4x2)
|
||||
Q_DECLARE_METATYPE(QMatrix4x3)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix2x2, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix2x3, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix2x4, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix3x2, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix3x3, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix3x4, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix4x2, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN(QMatrix4x3, Q_GUI_EXPORT)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QPageLayout)
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPageLayout::Unit, QPageLayout__Unit)
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPageLayout::Orientation, QPageLayout__Orientation)
|
||||
|
||||
// Multiplier for converting units to points.
|
||||
Q_GUI_EXPORT qreal qt_pointMultiplier(QPageLayout::Unit unit)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -149,8 +149,8 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageLayout &pageLayout);
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QPageLayout)
|
||||
Q_DECLARE_METATYPE(QPageLayout::Unit)
|
||||
Q_DECLARE_METATYPE(QPageLayout::Orientation)
|
||||
QT_DECL_METATYPE_EXTERN(QPageLayout, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPageLayout::Unit, QPageLayout__Unit, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPageLayout::Orientation, QPageLayout__Orientation, Q_GUI_EXPORT)
|
||||
|
||||
#endif // QPAGELAYOUT_H
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QPageRanges)
|
||||
|
||||
void QPageRangesPrivate::mergeIntervals()
|
||||
{
|
||||
const int count = intervals.count();
|
||||
|
|
|
|||
|
|
@ -120,6 +120,6 @@ Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_RELOCATABLE_TYPE);
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QPageRanges)
|
||||
QT_DECL_METATYPE_EXTERN(QPageRanges, Q_GUI_EXPORT)
|
||||
|
||||
#endif // QPAGERANGES_H
|
||||
|
|
|
|||
|
|
@ -48,6 +48,10 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QPageSize)
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPageSize::PageSizeId, QPageSize__PageSizeId)
|
||||
QT_IMPL_METATYPE_EXTERN_TAGGED(QPageSize::Unit, QPageSize__Unit)
|
||||
|
||||
// Define the Windows DMPAPER sizes for use in the look-up table
|
||||
// See http://msdn.microsoft.com/en-us/library/windows/desktop/dd319099.aspx
|
||||
|
||||
|
|
|
|||
|
|
@ -304,8 +304,8 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageSize &pageSize);
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QPageSize)
|
||||
Q_DECLARE_METATYPE(QPageSize::PageSizeId)
|
||||
Q_DECLARE_METATYPE(QPageSize::Unit)
|
||||
QT_DECL_METATYPE_EXTERN(QPageSize, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPageSize::PageSizeId, QPageSize__PageSizeId, Q_GUI_EXPORT)
|
||||
QT_DECL_METATYPE_EXTERN_TAGGED(QPageSize::Unit, QPageSize__Unit, Q_GUI_EXPORT)
|
||||
|
||||
#endif // QPAGESIZE_H
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
QT_IMPL_METATYPE_EXTERN(QStaticText)
|
||||
|
||||
QStaticTextUserData::~QStaticTextUserData()
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,6 +103,6 @@ Q_DECLARE_SHARED(QStaticText)
|
|||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
Q_DECLARE_METATYPE(QStaticText)
|
||||
QT_DECL_METATYPE_EXTERN(QStaticText, Q_GUI_EXPORT)
|
||||
|
||||
#endif // QSTATICTEXT_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue