diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-04-13 10:29:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-04-24 19:57:32 +0000 |
| commit | 895fe4b881ae819981c337d65c8fae5f5daaf164 (patch) | |
| tree | b10c1b2bd3e062bfbca122547774c15abde93f6b /src/qml/qml/qqmlexpression.cpp | |
| parent | 590c23b23c5f60d78aa92030f89259833496b8be (diff) | |
Get rid of QQmlAbstractExpression
The class is always used together with QQmlJavaScriptExpression,
so we can just as well fold the functionality together into one
class and simplify our code.
Change-Id: I23820e51efaaea16ae5db7e2153a827d7b22999e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 35e0bc8c64..9617e430b8 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -65,7 +65,7 @@ void QQmlExpressionPrivate::init(QQmlContextData *ctxt, const QString &expr, QOb { expression = expr; - QQmlAbstractExpression::setContext(ctxt); + QQmlJavaScriptExpression::setContext(ctxt); setScopeObject(me); expressionFunctionValid = false; } @@ -76,7 +76,7 @@ void QQmlExpressionPrivate::init(QQmlContextData *ctxt, QV4::Function *runtimeFu QV4::ExecutionEngine *engine = QQmlEnginePrivate::getV4Engine(ctxt->engine); function.set(engine, QV4::QmlBindingWrapper::createQmlCallableForFunction(ctxt, me, runtimeFunction)); - QQmlAbstractExpression::setContext(ctxt); + QQmlJavaScriptExpression::setContext(ctxt); setScopeObject(me); } |