diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index 29e836a8f4..a1ae68130c 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -132,10 +132,12 @@ public: int preferredSize; bool gap; }; +Q_DECLARE_TYPEINFO(QToolBarAreaLayoutItem, Q_PRIMITIVE_TYPE); class QToolBarAreaLayoutLine { public: + QToolBarAreaLayoutLine() {} // for QVector, don't use QToolBarAreaLayoutLine(Qt::Orientation orientation); QSize sizeHint() const; @@ -147,16 +149,15 @@ public: QRect rect; Qt::Orientation o; - QList toolBarItems; + QVector toolBarItems; }; +Q_DECLARE_TYPEINFO(QToolBarAreaLayoutLine, Q_MOVABLE_TYPE); class QToolBarAreaLayoutInfo { public: QToolBarAreaLayoutInfo(QInternal::DockPosition pos = QInternal::TopDock); - QList lines; - QSize sizeHint() const; QSize minimumSize() const; @@ -175,11 +176,13 @@ public: QRect itemRect(const QList &path) const; int distance(const QPoint &pos) const; + QVector lines; QRect rect; Qt::Orientation o; QInternal::DockPosition dockPos; bool dirty; }; +Q_DECLARE_TYPEINFO(QToolBarAreaLayoutInfo, Q_MOVABLE_TYPE); class QToolBarAreaLayout {