diff options
author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2020-03-23 20:34:14 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-23 21:43:17 +0100 |
commit | 468a244e160096a27ce4c47a6a0cc7c8da6163fd (patch) | |
tree | cb977a04a7163ecabed5f255507cbd6a2b26fbf9 /src/quicktemplates2/qquickstackview_p_p.h | |
parent | 67792feba0bc39cd79d789a45978436b09fd4adf (diff) |
Update dependencies on 'dev' in qt/qtquickcontrols2
Fix build after internal QtQml API changes.
Change-Id: Iaeafb84f5f2d9c60b54659f27e7baa448a858c4a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickstackview_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h index b8c4b817ea..d3267979e8 100644 --- a/src/quicktemplates2/qquickstackview_p_p.h +++ b/src/quicktemplates2/qquickstackview_p_p.h @@ -53,12 +53,12 @@ #include <QtQuick/private/qquickitemviewtransition_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQml/private/qv4value_p.h> +#include <QtQml/private/qqmlcontextdata_p.h> #include <QtCore/qset.h> #include <QtCore/qstack.h> QT_BEGIN_NAMESPACE -class QQmlContextData; class QQuickStackElement; struct QQuickStackTransition; @@ -79,7 +79,7 @@ public: QList<QQuickStackElement *> parseElements(int from, QQmlV4Function *args, QStringList *errors); QQuickStackElement *findElement(QQuickItem *item) const; QQuickStackElement *findElement(const QV4::Value &value) const; - QQuickStackElement *createElement(const QV4::Value &value, QQmlContextData *context, QString *error); + QQuickStackElement *createElement(const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error); bool pushElements(const QList<QQuickStackElement *> &elements); bool pushElement(QQuickStackElement *element); bool popElements(QQuickStackElement *element); |