diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-04-03 19:56:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-04 09:37:50 +0000 |
| commit | c7e98f4cb9717dcf267f23bf2e8ca57cdc874b84 (patch) | |
| tree | 70ada9cc2055ffd6431b787af33d3aeabb8485ba /src/quicktemplates2/qquickstackview_p_p.h | |
| parent | 88a62b3b910d09324dbbef3e1e791659ecd6537f (diff) | |
StackView: resolve relative URLs to the caller
Task-number: QTBUG-59309
Change-Id: I3c19d55431dd4831c4510acb5ef0e9fffa8f478f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickstackview_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickstackview_p_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h index 26d741f8..81ca9164 100644 --- a/src/quicktemplates2/qquickstackview_p_p.h +++ b/src/quicktemplates2/qquickstackview_p_p.h @@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE +class QQmlContextData; class QQuickStackElement; struct QQuickStackTransition; @@ -79,7 +80,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, QString *error); + QQuickStackElement *createElement(const QV4::Value &value, QQmlContextData *context, QString *error); bool pushElements(const QList<QQuickStackElement *> &elements); bool pushElement(QQuickStackElement *element); bool popElements(QQuickStackElement *element); |