1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index a9f2acdb06..d9a69a9ca3 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -53,7 +53,7 @@
 
 #include <private/qtqmlglobal_p.h>
 #include <private/qobject_p.h>
-
+#include <private/qqmlpropertyindex_p.h>
 #include <private/qv4value_p.h>
 #include <private/qv4persistent_p.h>
 #include <qjsengine.h>
@@ -174,7 +174,7 @@ public:
     void clearBindingBit(int);
     void setBindingBit(QObject *obj, int);
 
-    inline bool hasPendingBindingBit(int) const;
+    inline bool hasPendingBindingBit(int index) const;
     void setPendingBindingBit(QObject *obj, int);
     void clearPendingBindingBit(int);
 
@@ -227,7 +227,7 @@ public:
     static void markAsDeleted(QObject *);
     static void setQueuedForDeletion(QObject *);
 
-    static inline void flushPendingBinding(QObject *, int coreIndex);
+    static inline void flushPendingBinding(QObject *, QQmlPropertyIndex propertyIndex);
 
     static QQmlPropertyCache *ensurePropertyCache(QJSEngine *engine, QObject *object);
 
@@ -235,7 +235,7 @@ private:
     // For attachedProperties
     mutable QQmlDataExtended *extendedData;
 
-    void flushPendingBindingImpl(int coreIndex);
+    void flushPendingBindingImpl(QQmlPropertyIndex index);
 };
 
 bool QQmlData::wasDeleted(QObject *object)
@@ -288,20 +288,20 @@ bool QQmlData::hasBindingBit(int coreIndex) const
                                       (bindingBits[bit / 32] & (1 << (bit % 32))));
 }
 
-bool QQmlData::hasPendingBindingBit(int coreIndex) const
+bool QQmlData::hasPendingBindingBit(int index) const
 {
-    int bit = coreIndex * 2 + 1;
+    int bit = index * 2 + 1;
 
     return bindingBitsSize > bit &&
            ((bindingBitsSize == 32) ? (bindingBitsValue & (1 << bit)) :
                                       (bindingBits[bit / 32] & (1 << (bit % 32))));
 }
 
-void QQmlData::flushPendingBinding(QObject *o, int coreIndex)
+void QQmlData::flushPendingBinding(QObject *o, QQmlPropertyIndex propertyIndex)
 {
     QQmlData *data = QQmlData::get(o, false);
-    if (data && data->hasPendingBindingBit(coreIndex))
-        data->flushPendingBindingImpl(coreIndex);
+    if (data && data->hasPendingBindingBit(propertyIndex.coreIndex()))
+        data->flushPendingBindingImpl(propertyIndex);
 }
 
 QT_END_NAMESPACE