aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlexpression.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-07 08:54:12 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-07 12:46:55 +0200
commit0ae4fb4647d6b286805e01763341c126000155ea (patch)
tree39fa8356dc87f55a36b79349f4a0cf71264fb601 /src/qml/qml/qqmlexpression.cpp
parent5963aead75991ea8b0fded251e18ef75f099ab8f (diff)
Change some v8::Persistent to QV4::PersistentValue
Change-Id: I2c4e98cf7e778de9aafabdbd68e6682106343d12 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
-rw-r--r--src/qml/qml/qqmlexpression.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
index 29f53f3372..0f225228b3 100644
--- a/src/qml/qml/qqmlexpression.cpp
+++ b/src/qml/qml/qqmlexpression.cpp
@@ -67,8 +67,6 @@ QQmlExpressionPrivate::QQmlExpressionPrivate()
QQmlExpressionPrivate::~QQmlExpressionPrivate()
{
- qPersistentDispose(v8qmlscope);
- qPersistentDispose(v8function);
}
void QQmlExpressionPrivate::init(QQmlContextData *ctxt, const QString &expr, QObject *me)
@@ -335,8 +333,6 @@ void QQmlExpression::setExpression(const QString &expression)
d->expressionUtf8.clear();
d->expressionFunctionValid = false;
d->expressionFunctionRewritten = false;
- qPersistentDispose(d->v8function);
- qPersistentDispose(d->v8qmlscope);
}
// Must be called with a valid handle scope
@@ -358,7 +354,7 @@ v8::Handle<v8::Value> QQmlExpressionPrivate::v8value(bool *isUndefined)
expressionFunctionValid = true;
}
- return evaluate(context(), v8function, isUndefined);
+ return evaluate(context(), **v8function, isUndefined);
}
QVariant QQmlExpressionPrivate::value(bool *isUndefined)