diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-06-04 10:36:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-04 02:48:54 +0200 |
| commit | 3747f1972db869853a593f869154debf174c9cf2 (patch) | |
| tree | 334abc204225bfc54cc172d3dc518df5c14c9abb /src/qml/qml/qqmlvme.cpp | |
| parent | 469793778998aeaf46c99b7b8d049616bac4b689 (diff) | |
Send valueTypeIndex to setBindingNoEnable in the expected format.
Ensure we send a -1 if the property is not a value type property.
Change-Id: Ic4fa6954a0bcfd32d50da565f82f21f17d81ac9b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index c09971bede..bb245198bf 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -851,10 +851,11 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, binding->m_mePtr = &bindValues.top(); if (instr.isAlias) { + int valueTypeIndex = (property & 0x00FF0000) ? (property >> 24) : -1; QQmlAbstractBinding *old = QQmlPropertyPrivate::setBindingNoEnable(target, - instr.property & 0xFFFF, - instr.property >> 24, + property & 0xFFFF, + valueTypeIndex, binding); if (old) { old->destroy(); } } else { |