diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-03 12:39:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 20:45:19 +0100 |
| commit | ca056ed3fa25b417bc88786377999b04640b1265 (patch) | |
| tree | 2014c94b25a9ba9be7c270fb80f09531a30d8eb0 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 0f2c736de46f5f85fc75eb04445913fe3721cbde (diff) | |
[new compiler] Fix tst_qqmlvaluetypes
* Make sure to remove earlier set bindings for any value type property, not just
scripts. We want font.bold: false to also override an earlier actual binding
for example.
* Propagate on assignments on qualified property names throughout the
chain of bindings - that makes it easier to detect them early on.
* The group property collection in the bindings validator should only include
value bindings to group properties, not on assignments - as they can always
appear in parallel.
Change-Id: Ib7ec4de755a5a8d269324a77cba36eb945366274
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index e275b92518..e965cab179 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -603,8 +603,6 @@ void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip) const QV4::CompiledData::Binding *binding = _compiledObject->bindingTable(); for (quint32 i = 0; i < _compiledObject->nBindings; ++i, ++binding) { - if (binding->type != QV4::CompiledData::Binding::Type_Script) - continue; property = binding->propertyNameIndex != 0 ? _propertyCache->property(stringAt(binding->propertyNameIndex), _qobject, context) : defaultProperty; if (property) bindingSkipList |= (1 << property->coreIndex); |