Send valueTypeIndex to setBindingNoEnable in the expected format.
authorMichael Brasser <michael.brasser@nokia.com>
Mon, 4 Jun 2012 00:36:52 +0000 (10:36 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 4 Jun 2012 00:48:54 +0000 (02:48 +0200)
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>
src/qml/qml/qqmlvme.cpp

index c09971b..bb24519 100644 (file)
@@ -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 {