diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-28 13:06:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-02 20:52:46 +0100 |
commit | 735cbe15c20f3a3fde23987b0e1a596d64324f20 (patch) | |
tree | 97790ac814e893d7987dddd50a0e77e03b7e17c6 /src/qml/qml/qqmlobjectcreator_p.h | |
parent | a283fab5bec49cc1588125b3130867796b04e0d0 (diff) |
[new compiler] Fix for tst_qqmlconnections
Make sure to pass onFooChanged handlers to QQmlConnection's custom parser by
not relying on the signal handler converter to set the
IsSignalHandlerExpression flag. That should only be set for real signal
handlers, the custom parser gets the raw bindings.
Also don't try to initialize bindings at creation time the custom parser
covers.
Change-Id: Iae22bc886c312843136f073959e59da440f4184c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator_p.h')
-rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index 2545e45fb6..d72b9ec065 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -80,9 +80,11 @@ private: QObject *createInstance(int index, QObject *parent = 0); - bool populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache, QObject *bindingTarget, QQmlPropertyData *valueTypeProperty, bool installPropertyCache = true); + bool populateInstance(int index, QObject *instance, QQmlRefPointer<QQmlPropertyCache> cache, + QObject *bindingTarget, QQmlPropertyData *valueTypeProperty, bool installPropertyCache = true, + const QBitArray &bindingsToSkip = QBitArray()); - void setupBindings(); + void setupBindings(const QBitArray &bindingsToSkip); bool setPropertyBinding(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); void setPropertyValue(QQmlPropertyData *property, const QV4::CompiledData::Binding *binding); void setupFunctions(); |