diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-22 13:16:59 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 13:16:59 +0100 |
| commit | 503eec194ea8bc70bfdbfd06bd0832a77cfcc137 (patch) | |
| tree | 6b32fb2c0d59f2efac71432fe3509af0aad2b8b0 /src/quick/items/qquickpathview_p_p.h | |
| parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
| parent | d815621963cee5571ed93fb89561c4884a685b6b (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/quick/items/qquickpathview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickpathview_p_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 9f504db22f..26533057d1 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -55,7 +55,6 @@ #include "qquickpathview_p.h" #include "qquickitem_p.h" -#include "qquickvisualdatamodel_p.h" #include <QtQml/qqml.h> #include <QtCore/qdatetime.h> @@ -63,6 +62,7 @@ #include <private/qquickanimation_p_p.h> #include <private/qqmlguard_p.h> +#include <private/qqmldelegatemodel_p.h> #include <private/qquicktimeline_p_p.h> QT_BEGIN_NAMESPACE @@ -152,6 +152,7 @@ public: bool dragging : 1; bool requestedOnPath : 1; bool inRequest : 1; + bool delegateValidated : 1; QElapsedTimer timer; qint64 lastPosTime; QPointF lastPos; @@ -168,7 +169,7 @@ public: qreal requestedZ; QList<QQuickItem *> items; QList<QQuickItem *> itemCache; - QQmlGuard<QQuickVisualModel> model; + QQmlGuard<QQmlInstanceModel> model; QVariant modelVariant; enum MovementReason { Other, SetIndex, Mouse }; MovementReason moveReason; |