diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-24 19:56:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-26 02:47:41 +0200 |
| commit | 82be884e2f8fe38c23476cd7e03a410225dfd42f (patch) | |
| tree | 9bf4525a6f54a86dca565d3999632fa8ccd74e5f /src/qml/qml/qqmlbinding.cpp | |
| parent | 805aa4df3544591afd8c822a51abd142f9008f01 (diff) | |
Small cleanup
We don't do rewriting for bindings anymore.
Remove a method overload that's not really needed
anymore.
Change-Id: I9d57d30dce4848cb06c88c3f042ccf30e6d41aab
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 32b20149e8..79b1b2efc5 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -121,7 +121,6 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte if (!ctxt && (!scriptPrivate->context || !scriptPrivate->context->isValid())) return; - bool needRewrite = true; QString code; int id = scriptPrivate->bindingId; @@ -133,7 +132,6 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte Q_ASSERT(typeData); if (QQmlCompiledData *cdata = typeData->compiledData()) { - needRewrite = true; code = cdata->primitives.at(id); m_url = cdata->name; } @@ -150,10 +148,7 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte m_lineNumber = scriptPrivate->lineNumber; m_columnNumber = scriptPrivate->columnNumber; - if (needRewrite) - v4function = qmlBinding(context(), scopeObject(), code, QString(), m_lineNumber); - else - v4function = evalFunction(context(), scopeObject(), code, QString(), m_lineNumber); + v4function = qmlBinding(context(), scopeObject(), code, QString(), m_lineNumber); } QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt) |