diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:19 +0200 |
| commit | 34956bc234bf1b2ebcf224a256297293ba4276aa (patch) | |
| tree | 732fc88b9ea113e8ff3f106a5e5bc33610c5ed57 /src/quick/items/qquickitem_p.h | |
| parent | e3a6565c3832e6f3001d49c52ca59fa4fa555f1b (diff) | |
| parent | 210617de78c78af44efdc251ba7a207c5c26e11c (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I7b0ad528da17ecdb955c2d0c792c9f113904623e
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index ad649e5b5f..fed3e88b68 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -62,7 +62,6 @@ #include <QtQuick/qsgnode.h> #include "qquickclipnode_p.h" -#include <private/qpodvector_p.h> #include <QtQuick/private/qquickstate_p.h> #include <private/qqmlnullablevalue_p.h> #include <private/qqmlnotifier_p.h> @@ -332,7 +331,7 @@ public: Q_DECLARE_FLAGS(GeometryChangeTypes, GeometryChangeType) struct ChangeListener { - ChangeListener(QQuickItemChangeListener *l, QQuickItemPrivate::ChangeTypes t) : listener(l), types(t), gTypes(GeometryChange) {} + ChangeListener(QQuickItemChangeListener *l = Q_NULLPTR, QQuickItemPrivate::ChangeTypes t = 0) : listener(l), types(t), gTypes(GeometryChange) {} ChangeListener(QQuickItemChangeListener *l, QQuickItemPrivate::GeometryChangeTypes gt) : listener(l), types(Geometry), gTypes(gt) {} QQuickItemChangeListener *listener; QQuickItemPrivate::ChangeTypes types; @@ -386,7 +385,7 @@ public: inline Qt::MouseButtons acceptedMouseButtons() const; - QPODVector<QQuickItemPrivate::ChangeListener,4> changeListeners; + QVector<QQuickItemPrivate::ChangeListener> changeListeners; void addItemChangeListener(QQuickItemChangeListener *listener, ChangeTypes types); void removeItemChangeListener(QQuickItemChangeListener *, ChangeTypes types); @@ -932,6 +931,7 @@ QSGNode *QQuickItemPrivate::childContainerNode() } Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickItemPrivate::ChangeTypes) +Q_DECLARE_TYPEINFO(QQuickItemPrivate::ChangeListener, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE |