diff options
| author | Mark Visser <mjmvisser@gmail.com> | 2013-04-30 14:12:37 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-08 10:46:13 +0200 |
| commit | 13afb2b49daec9f5f65dc9a99151c91d685dce13 (patch) | |
| tree | 79c00dec10a6d90152213c0a85fafe6a9a480a95 /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 22fc92cf9187460785a05e31620823fe8afe5eab (diff) | |
QQmlError.object now holds the scope object that caused exceptions.
Exception errors sent via QQmlEngine::warnings lacked a pointer to the
containing scope. I added an object property to QQmlError, and the
necessary code to fill it with the QObject* scope from binding exception
callbacks.
Task-number: QTBUG-30930
Change-Id: I2a987e8cefc3a2a474d338893e9ebcb77c167adf
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index c48972e6a1..b521ea3bee 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -84,6 +84,7 @@ public: void setMessage(v8::Handle<v8::Message> message); void setErrorLocation(const QUrl &url, quint16 line, quint16 column); void setErrorDescription(const QString &description); + void setErrorObject(QObject *object); private: void convertMessageToError(QQmlEngine *engine) const; |