From: Michael Brasser Date: Mon, 4 Jun 2012 00:36:52 +0000 (+1000) Subject: Send valueTypeIndex to setBindingNoEnable in the expected format. X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3747f1972db869853a593f869154debf174c9cf2;p=konrad%2Fqtdeclarative.git 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 --- diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index c09971b..bb24519 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -851,10 +851,11 @@ QObject *QQmlVME::run(QList *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 {