diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-23 15:52:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 09:05:16 +0200 |
| commit | 12fd2ccd3fa2dc0133b5a3fb89f9fdf5cf721232 (patch) | |
| tree | 880acb9c7c0d8289185b6aebe4339f439c707a0e /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 2e4f66caa8a5f9e887dbdb4e3f2ae5c9be9a7005 (diff) | |
Fix Persistent/WeakValue API
Don't use unprotected Values in the API anymore.
Change-Id: I8851628227fca374de24701bc8ee0908b5ae3923
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index f08b3af6cf..c13e191216 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -146,12 +146,12 @@ public: QQmlDelayedError *delayedError(); static void exceptionToError(const QV4::Exception &e, QQmlError &); - static QV4::PersistentValue evalFunction(QQmlContextData *ctxt, QObject *scope, + static QV4::ReturnedValue evalFunction(QQmlContextData *ctxt, QObject *scope, const QString &code, const QString &filename, quint16 line, QV4::PersistentValue *qmlscope = 0); // doesn't require rewriting the expression - static QV4::PersistentValue qmlBinding(QQmlContextData *ctxt, QObject *scope, + static QV4::ReturnedValue qmlBinding(QQmlContextData *ctxt, QObject *scope, const QString &code, const QString &filename, quint16 line, QV4::PersistentValue *qmlscope = 0); |