aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickstackview_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-23 13:03:06 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-24 13:27:48 +0000
commitaac1e246e46ab6ea70c14a61b1340d529763787d (patch)
tree51e891613536ad8a0a92af619b266678aa4c4ddb /src/quicktemplates2/qquickstackview_p_p.h
parent762d4ceb5fe19d97bcdbdba1dae74816126b7b75 (diff)
StackView: provide better warnings and errors
Check for valid URLs and test object types. Throw warnings when appropriate instead of crashing later. Task-number: QTBUG-59634 Change-Id: Ia269dc8afd31b618f1ff7aec94d684029cb78244 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickstackview_p_p.h b/src/quicktemplates2/qquickstackview_p_p.h
index 532a2b57bd..26d741f81f 100644
--- a/src/quicktemplates2/qquickstackview_p_p.h
+++ b/src/quicktemplates2/qquickstackview_p_p.h
@@ -76,10 +76,10 @@ public:
void setCurrentItem(QQuickStackElement *element);
- QList<QQuickStackElement *> parseElements(QQmlV4Function *args, int from = 0);
+ 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);
+ QQuickStackElement *createElement(const QV4::Value &value, QString *error);
bool pushElements(const QList<QQuickStackElement *> &elements);
bool pushElement(QQuickStackElement *element);
bool popElements(QQuickStackElement *element);