diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-26 20:50:44 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-05-30 07:16:25 +0000 |
commit | d146b955f5be556e155441637c4dbf0920ef892b (patch) | |
tree | 1b25637512e87e783041394f061d9eece1822927 /src/qml/qml/qqmlobjectcreator_p.h | |
parent | f27d058c11b54b3c5f72d41c25cb00657b49a37b (diff) |
Remove the custom parser binding bits hash table from QQmlCompiledData
Similary to the other hash tables we can store the actual information about
whether a binding is covered by a custom parser or not straight in the
CompiledData::Binding.
Change-Id: Iab9044af57338cec935d3ef38764d7dc1aa507e8
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
-rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index d0ed38334d..f51cf3a2ca 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -111,10 +111,9 @@ private: QObject *createInstance(int index, QObject *parent = 0, bool isContextObject = false); bool populateInstance(int index, QObject *instance, - QObject *bindingTarget, const QQmlPropertyData *valueTypeProperty, - const QBitArray &bindingsToSkip = QBitArray()); + QObject *bindingTarget, const QQmlPropertyData *valueTypeProperty); - void setupBindings(const QBitArray &bindingsToSkip, bool applyDeferredBindings = false); + void setupBindings(bool applyDeferredBindings = false); bool setPropertyBinding(const QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); void setPropertyValue(const QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); void setupFunctions(); |