aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickpropertychanges.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-24 12:10:46 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-24 12:42:45 +0200
commitbe4f0622f8c0d89371e9314e2d53c246dd77871b (patch)
tree55417377038c0a859703f4c5821c53df81e77be7 /src/quick/util/qquickpropertychanges.cpp
parent1eb41200948ab414f1c47d93123b41c547a993df (diff)
Remove the remaining dependencies onto the binding rewriter
Remove the remaining places that were rewriting bindings. Remove the binding rewriter class. Change-Id: Ib1e9121dc10f4526ddb7cf0ae32fecd8ce2d4993 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util/qquickpropertychanges.cpp')
-rw-r--r--src/quick/util/qquickpropertychanges.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp
index 0193d3def0..c1173d70f5 100644
--- a/src/quick/util/qquickpropertychanges.cpp
+++ b/src/quick/util/qquickpropertychanges.cpp
@@ -42,7 +42,6 @@
#include "qquickpropertychanges_p.h"
#include <private/qqmlopenmetaobject_p.h>
-#include <private/qqmlrewrite_p.h>
#include <private/qqmlengine_p.h>
#include <qqmlinfo.h>
@@ -292,7 +291,7 @@ QQuickPropertyChangesParser::compile(const QList<QQmlCustomParserProperty> &prop
var = QVariant(v.asScript());
{
// Pre-rewrite the expression
- id = rewriteBinding(v, data.at(ii).first);
+ id = bindingIdentifier(v, data.at(ii).first);
}
break;
}
@@ -483,7 +482,7 @@ QQuickPropertyChanges::ActionList QQuickPropertyChanges::actions()
QQmlBinding *newBinding = e.id != QQmlBinding::Invalid ? QQmlBinding::createBinding(e.id, object(), qmlContext(this), e.url.toString(), e.column) : 0;
if (!newBinding)
- newBinding = new QQmlBinding(e.expression, false, object(), QQmlContextData::get(qmlContext(this)), e.url.toString(), e.line, e.column);
+ newBinding = new QQmlBinding(e.expression, object(), QQmlContextData::get(qmlContext(this)), e.url.toString(), e.line, e.column);
if (d->isExplicit) {
// in this case, we don't want to assign a binding, per se,