diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp index cc7164adcd3..268f9cfe9f2 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstancesignalspy.cpp @@ -96,7 +96,11 @@ void NodeInstanceSignalSpy::registerObject(QObject *spiedObject, const QString & if (metaProperty.isReadable() && QDeclarativeMetaType::isList(metaProperty.userType())) { QDeclarativeListReference list(spiedObject, metaProperty.name()); +#if QT_VERSION<0x050000 if (list.canCount() && list.canAt()) { +#else + if (list.isReadable()) { +#endif for (int i = 0; i < list.count(); i++) { QObject *propertyObject = list.at(i); if (propertyObject) diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp index 21545cb2bc7..8bbe0773be4 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp @@ -289,7 +289,12 @@ static QVariant objectToVariant(QObject *object) static bool hasFullImplementedListInterface(const QDeclarativeListReference &list) { + +#if QT_VERSION<0x050000 return list.isValid() && list.canCount() && list.canAt() && list.canAppend() && list.canClear(); +#else + return !list.isManipulatable(); +#endif } static void removeObjectFromList(const QDeclarativeProperty &property, QObject *objectToBeRemoved, QDeclarativeEngine * engine) @@ -719,7 +724,11 @@ void allSubObject(QObject *object, QObjectList &objectList) if (metaProperty.isReadable() && QDeclarativeMetaType::isList(metaProperty.userType())) { QDeclarativeListReference list(object, metaProperty.name()); +#if QT_VERSION<0x050000 if (list.canCount() && list.canAt()) { +#else + if (list.isReadable()) { +#endif for (int i = 0; i < list.count(); i++) { QObject *propertyObject = list.at(i); allSubObject(propertyObject, objectList);