summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtoolbararealayout_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets/qtoolbararealayout_p.h')
-rw-r--r--src/widgets/widgets/qtoolbararealayout_p.h9
1 files changed, 6 insertions, 3 deletions
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<QToolBarAreaLayoutItem> toolBarItems;
+ QVector<QToolBarAreaLayoutItem> toolBarItems;
};
+Q_DECLARE_TYPEINFO(QToolBarAreaLayoutLine, Q_MOVABLE_TYPE);
class QToolBarAreaLayoutInfo
{
public:
QToolBarAreaLayoutInfo(QInternal::DockPosition pos = QInternal::TopDock);
- QList<QToolBarAreaLayoutLine> lines;
-
QSize sizeHint() const;
QSize minimumSize() const;
@@ -175,11 +176,13 @@ public:
QRect itemRect(const QList<int> &path) const;
int distance(const QPoint &pos) const;
+ QVector<QToolBarAreaLayoutLine> lines;
QRect rect;
Qt::Orientation o;
QInternal::DockPosition dockPos;
bool dirty;
};
+Q_DECLARE_TYPEINFO(QToolBarAreaLayoutInfo, Q_MOVABLE_TYPE);
class QToolBarAreaLayout
{