diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-19 13:05:12 +0200 |
| commit | a2d36c9ef566a3e0ec42e297a3d314f134c87da1 (patch) | |
| tree | 3cf02240bc190e0ae52c5cb1163e523635e443ab /src/quick/items/qquickitemviewfxitem_p_p.h | |
| parent | 15b90204fa5126f339db551cf7429534f1359322 (diff) | |
| parent | e9520ec84c95e10a6826b2289e46552a2d446895 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
src/imports/sharedimage/qsharedimageloader.cpp
src/quick/items/qquickitemviewfxitem_p_p.h
Change-Id: I12ce7c32788f4a394188a934e689b4ebac78138b
Diffstat (limited to 'src/quick/items/qquickitemviewfxitem_p_p.h')
| -rw-r--r-- | src/quick/items/qquickitemviewfxitem_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemviewfxitem_p_p.h b/src/quick/items/qquickitemviewfxitem_p_p.h index 3bc5ba440c..3985630cda 100644 --- a/src/quick/items/qquickitemviewfxitem_p_p.h +++ b/src/quick/items/qquickitemviewfxitem_p_p.h @@ -54,6 +54,7 @@ #include <QtQuick/private/qtquickglobal_p.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickitemviewtransition_p.h> +#include <private/qanimationjobutil_p.h> QT_REQUIRE_CONFIG(quick_itemview); @@ -94,6 +95,7 @@ public: virtual bool contains(qreal x, qreal y) const = 0; + SelfDeletable m_selfDeletable; QPointer<QQuickItem> item; QQuickItemChangeListener *changeListener; QQuickItemViewTransitionableItem *transitionableItem; |