diff options
Diffstat (limited to 'src/quick/items/qquickpathview_p_p.h')
-rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 26533057d1..aa539e7cfc 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -61,7 +61,6 @@ #include <QtCore/qcoreapplication.h> #include <private/qquickanimation_p_p.h> -#include <private/qqmlguard_p.h> #include <private/qqmldelegatemodel_p.h> #include <private/qquicktimeline_p_p.h> @@ -132,7 +131,7 @@ public: QQuickPath *path; int currentIndex; - QQmlGuard<QQuickItem> currentItem; + QPointer<QQuickItem> currentItem; qreal currentItemOffset; qreal startPc; QPointF startPoint; @@ -169,7 +168,7 @@ public: qreal requestedZ; QList<QQuickItem *> items; QList<QQuickItem *> itemCache; - QQmlGuard<QQmlInstanceModel> model; + QPointer<QQmlInstanceModel> model; QVariant modelVariant; enum MovementReason { Other, SetIndex, Mouse }; MovementReason moveReason; |