aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmljavascriptexpression.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-08 12:31:23 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-08 15:13:42 +0200
commitba1a2a62c1a761d88912b79804bdf437c9a26aa7 (patch)
treec58bcfa03af442b79bf0ff95645b1efd25045866 /src/qml/qml/qqmljavascriptexpression.cpp
parentc19c4f7687bafd61861ad6dc6f7f644c8e97a536 (diff)
Convert qqmljavascriptexpression to use QV4::PersistentValue
Change-Id: Idd704b55be61dd78c59fffdf966fc8497af852d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r--src/qml/qml/qqmljavascriptexpression.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index cd8837073a..759955f335 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -64,8 +64,7 @@ bool QQmlDelayedError::addError(QQmlEnginePrivate *e)
void QQmlDelayedError::setMessage(v8::Handle<v8::Message> message)
{
- qPersistentDispose(m_message);
- m_message = qPersistentNew<v8::Message>(message);
+ m_message = message.get();
}
void QQmlDelayedError::setErrorLocation(const QUrl &url, quint16 line, quint16 column)
@@ -90,9 +89,9 @@ void QQmlDelayedError::setErrorDescription(const QString &description)
*/
void QQmlDelayedError::convertMessageToError(QQmlEngine *engine) const
{
- if (!m_message.IsEmpty() && engine) {
- QQmlExpressionPrivate::exceptionToError(m_message, m_error);
- qPersistentDispose(m_message);
+ if (!!m_message && engine) {
+ QQmlExpressionPrivate::exceptionToError(v8::Handle<v8::Message>(m_message.data()), m_error);
+ m_message.reset();
}
}