diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-23 13:03:06 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-24 13:27:48 +0000 |
| commit | aac1e246e46ab6ea70c14a61b1340d529763787d (patch) | |
| tree | 51e891613536ad8a0a92af619b266678aa4c4ddb /src/quicktemplates2/qquickstackelement_p_p.h | |
| parent | 762d4ceb5fe19d97bcdbdba1dae74816126b7b75 (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/qquickstackelement_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickstackelement_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickstackelement_p_p.h b/src/quicktemplates2/qquickstackelement_p_p.h index 9cb11855..2308f47d 100644 --- a/src/quicktemplates2/qquickstackelement_p_p.h +++ b/src/quicktemplates2/qquickstackelement_p_p.h @@ -67,8 +67,8 @@ class QQuickStackElement : public QQuickItemViewTransitionableItem, public QQuic public: ~QQuickStackElement(); - static QQuickStackElement *fromString(const QString &str, QQuickStackView *view); - static QQuickStackElement *fromObject(QObject *object, QQuickStackView *view); + static QQuickStackElement *fromString(const QString &str, QQuickStackView *view, QString *error); + static QQuickStackElement *fromObject(QObject *object, QQuickStackView *view, QString *error); bool load(QQuickStackView *parent); void incubate(QObject *object); |