diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 13:28:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-28 13:28:10 +0200 |
| commit | 63398defdbec12979b61120f690e984af0496c37 (patch) | |
| tree | ab7a29ea0040d46c47004fed3c211a831bc48e9c /src/quick/items/qquickitemview_p_p.h | |
| parent | cff8d9f1d2d309cd9417bb93386a1443ed1892c3 (diff) | |
| parent | 692b2da77427259a3589cf8a1311075863f2f5ec (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I59343fe228ca6b823b61577e5a0907e7381899c2
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 170027de87..89c0de704b 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -287,7 +287,7 @@ public: : item(i), moveKey(k) {} }; QQuickItemViewTransitioner *transitioner; - QList<FxViewItem *> releasePendingTransition; + QVector<FxViewItem *> releasePendingTransition; mutable qreal minExtent; mutable qreal maxExtent; |