Permit value types with metatype IDs >= QMetaType::User

Remove the assumption that value types must be types defined by
Qt, having metatype IDs below QMetaType::User.

Task-number: QTBUG-26352
Change-Id: Ib5a56ff2e7892e82adf17a3a1e7517a0c9fe0534
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlabstractbinding.cpp b/src/qml/qml/qqmlabstractbinding.cpp
index 1e5ce8d64a..f663d9a0e0 100644
--- a/src/qml/qml/qqmlabstractbinding.cpp
+++ b/src/qml/qml/qqmlabstractbinding.cpp
@@ -92,10 +92,10 @@ void QQmlAbstractBinding::addToObject()
 
     QQmlData *data = QQmlData::get(obj, true);
 
-    if (index & 0xFF000000) {
+    if (index & 0xFFFF0000) {
         // Value type
 
-        int coreIndex = index & 0xFFFFFF;
+        int coreIndex = index & 0x0000FFFF;
 
         // Find the value type proxy (if there is one)
         QQmlValueTypeProxyBinding *proxy = 0;
@@ -141,11 +141,11 @@ void QQmlAbstractBinding::removeFromObject()
         QQmlData *data = QQmlData::get(obj, false);
         Q_ASSERT(data);
 
-        if (index & 0xFF000000) {
+        if (index & 0xFFFF0000) {
 
             // Find the value type binding
             QQmlAbstractBinding *vtbinding = data->bindings;
-            while (vtbinding->propertyIndex() != (index & 0xFFFFFF)) {
+            while (vtbinding->propertyIndex() != (index & 0x0000FFFF)) {
                 vtbinding = vtbinding->nextBinding();
                 Q_ASSERT(vtbinding);
             }