diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-21 01:10:37 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-21 08:04:34 +0100 |
commit | b3d8a4d47db63a06d354b6002ec764fd1442ec6e (patch) | |
tree | 7698afa9e80b58db70fcf6cd5163beaa33a10688 /src/qml/qml/qqmlexpression.cpp | |
parent | 20d9454ce6c32e61794f68d75fc82bd67737a306 (diff) |
Cleanupsv5.3.0-beta1
* Get rid of members in QQmlCompiledData that were used by the VME
and are now unused
* Get rid of QQmlVME friend declarations that are not needed anymore
Change-Id: I11b4b6f0b4b0b60edf92a1256be3d0d44d76bbc9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index b64dd9bd39..6034d3fdea 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -168,16 +168,9 @@ QQmlExpression::QQmlExpression(const QQmlScriptString &script, QQmlContext *ctxt Q_ASSERT(typeData); if (QQmlCompiledData *cdata = typeData->compiledData()) { - int id = scriptPrivate->bindingId; - if (id >= 0) { - defaultConstruction = false; - d->init(evalCtxtData, cdata->primitives.at(id), scopeObject, - cdata->name, scriptPrivate->lineNumber, scriptPrivate->columnNumber); - } else { - d->url = cdata->name; - d->line = scriptPrivate->lineNumber; - d->column = scriptPrivate->columnNumber; - } + d->url = cdata->name; + d->line = scriptPrivate->lineNumber; + d->column = scriptPrivate->columnNumber; } typeData->release(); |