From 7631ce8e651d66710bb7a4b6e195c3af0e148573 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 12 Nov 2020 13:57:45 +0200 Subject: [PATCH] qt6: update submodules * Update to Qt 6.0.0-beta5 content. * Add patch from codereview for qt3d to build against beta5 content. * disable qtopcua module temporarily due build issues against beta5 content. Task-number: QTBUG-86349 Change-Id: I0665d1c3df5d8dee1dbaac89a7973d5f22c5a8ad Reviewed-by: Samuli Piippo --- ...nge-of-QQmlListProperty-to-qsizetype.patch | 1451 +++++++++++++++++ recipes-qt/qt6/qt3d_git.bb | 1 + recipes-qt/qt6/qt5compat_git.bb | 2 +- recipes-qt/qt6/qtbase_git.bb | 2 +- recipes-qt/qt6/qtdeclarative_git.bb | 2 +- recipes-qt/qt6/qtopcua_git.bb | 1 + recipes-qt/qt6/qtquick3d_git.bb | 2 +- recipes-qt/qt6/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt6/qtquicktimeline_git.bb | 2 +- recipes-qt/qt6/qtshadertools_git.bb | 2 +- recipes-qt/qt6/qtsvg_git.bb | 2 +- recipes-qt/qt6/qttools_git.bb | 2 +- recipes-qt/qt6/qttranslations_git.bb | 2 +- ...canner-to-be-built-without-dependenc.patch | 19 +- recipes-qt/qt6/qtwayland_git.bb | 2 +- 15 files changed, 1469 insertions(+), 25 deletions(-) create mode 100644 recipes-qt/qt6/qt3d/0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch diff --git a/recipes-qt/qt6/qt3d/0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch b/recipes-qt/qt6/qt3d/0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch new file mode 100644 index 0000000..f830591 --- /dev/null +++ b/recipes-qt/qt6/qt3d/0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch @@ -0,0 +1,1451 @@ +From 0c3c297c2aff81cf0806d960b175692cf79d54aa Mon Sep 17 00:00:00 2001 +From: Mike Krus +Date: Sat, 14 Nov 2020 10:17:35 +0000 +Subject: [PATCH] Follow up on change of QQmlListProperty to qsizetype + +Update dependencies. + +Change-Id: Ie7fdd9626653e89ad43e8bdb22b0e764618b1e9e +--- + dependencies.yaml | 6 +++--- + src/quick3d/quick3d/items/quick3dentity.cpp | 4 ++-- + src/quick3d/quick3d/items/quick3dentity_p.h | 4 ++-- + src/quick3d/quick3d/items/quick3dgeometry.cpp | 4 ++-- + src/quick3d/quick3d/items/quick3dgeometry_p.h | 4 ++-- + src/quick3d/quick3d/items/quick3djoint.cpp | 4 ++-- + src/quick3d/quick3d/items/quick3djoint_p.h | 4 ++-- + src/quick3d/quick3d/items/quick3dnode.cpp | 8 ++++---- + src/quick3d/quick3d/items/quick3dnode_p.h | 8 ++++---- + .../items/quick3danimationcontroller.cpp | 4 ++-- + .../items/quick3danimationcontroller_p.h | 4 ++-- + .../quick3danimation/items/quick3danimationgroup.cpp | 4 ++-- + .../quick3danimation/items/quick3danimationgroup_p.h | 4 ++-- + .../quick3danimation/items/quick3dchannelmapper.cpp | 4 ++-- + .../quick3danimation/items/quick3dchannelmapper_p.h | 4 ++-- + .../items/quick3dkeyframeanimation.cpp | 12 ++++++------ + .../items/quick3dkeyframeanimation_p.h | 4 ++-- + .../items/quick3dmorphinganimation.cpp | 4 ++-- + .../items/quick3dmorphinganimation_p.h | 4 ++-- + .../quick3danimation/items/quick3dmorphtarget.cpp | 4 ++-- + .../quick3danimation/items/quick3dmorphtarget_p.h | 4 ++-- + .../items/quick3dvertexblendanimation.cpp | 4 ++-- + .../items/quick3dvertexblendanimation_p.h | 7 +++---- + .../quick3dextras/items/quick3dspritesheet.cpp | 4 ++-- + .../quick3dextras/items/quick3dspritesheet_p.h | 4 ++-- + src/quick3d/quick3dinput/items/quick3daction.cpp | 4 ++-- + src/quick3d/quick3dinput/items/quick3daction_p.h | 4 ++-- + src/quick3d/quick3dinput/items/quick3daxis.cpp | 4 ++-- + src/quick3d/quick3dinput/items/quick3daxis_p.h | 4 ++-- + src/quick3d/quick3dinput/items/quick3dinputchord.cpp | 12 ++++++------ + src/quick3d/quick3dinput/items/quick3dinputchord_p.h | 4 ++-- + .../quick3dinput/items/quick3dinputsequence.cpp | 4 ++-- + .../quick3dinput/items/quick3dinputsequence_p.h | 4 ++-- + .../quick3dinput/items/quick3dlogicaldevice.cpp | 8 ++++---- + .../quick3dinput/items/quick3dlogicaldevice_p.h | 8 ++++---- + .../quick3dinput/items/quick3dphysicaldevice.cpp | 4 ++-- + .../quick3dinput/items/quick3dphysicaldevice_p.h | 4 ++-- + src/quick3d/quick3drender/items/quick3deffect.cpp | 8 ++++---- + src/quick3d/quick3drender/items/quick3deffect_p.h | 8 ++++---- + .../quick3drender/items/quick3dlayerfilter.cpp | 4 ++-- + .../quick3drender/items/quick3dlayerfilter_p.h | 4 ++-- + src/quick3d/quick3drender/items/quick3dmaterial.cpp | 4 ++-- + src/quick3d/quick3drender/items/quick3dmaterial_p.h | 4 ++-- + src/quick3d/quick3drender/items/quick3draycaster.cpp | 4 ++-- + .../quick3drender/items/quick3draycaster_p_p.h | 4 ++-- + .../quick3drender/items/quick3drenderpass.cpp | 12 ++++++------ + .../quick3drender/items/quick3drenderpass_p.h | 12 ++++++------ + .../quick3drender/items/quick3drenderpassfilter.cpp | 8 ++++---- + .../quick3drender/items/quick3drenderpassfilter_p.h | 8 ++++---- + .../items/quick3drendertargetoutput.cpp | 4 ++-- + .../items/quick3drendertargetoutput_p.h | 4 ++-- + .../quick3drender/items/quick3dshaderdataarray.cpp | 4 ++-- + .../quick3drender/items/quick3dshaderdataarray_p.h | 4 ++-- + src/quick3d/quick3drender/items/quick3dstateset.cpp | 4 ++-- + src/quick3d/quick3drender/items/quick3dstateset_p.h | 4 ++-- + src/quick3d/quick3drender/items/quick3dtechnique.cpp | 12 ++++++------ + src/quick3d/quick3drender/items/quick3dtechnique_p.h | 12 ++++++------ + .../quick3drender/items/quick3dtechniquefilter.cpp | 8 ++++---- + .../quick3drender/items/quick3dtechniquefilter_p.h | 8 ++++---- + src/quick3d/quick3drender/items/quick3dtexture.cpp | 4 ++-- + src/quick3d/quick3drender/items/quick3dtexture_p.h | 4 ++-- + .../quick3dscene2d/items/qt3dquick3dscene2d.cpp | 4 ++-- + .../quick3dscene2d/items/qt3dquick3dscene2d_p.h | 4 ++-- + 63 files changed, 172 insertions(+), 173 deletions(-) + +diff --git a/dependencies.yaml b/dependencies.yaml +index 0ccf70157..390f150e4 100644 +--- a/dependencies.yaml ++++ b/dependencies.yaml +@@ -1,10 +1,10 @@ + dependencies: + ../qtbase: +- ref: 46a552583f99ed04945ccf949afbdff58dcdfa1f ++ ref: 4e935e35f1abdc8fb8313c04b1605b78b75a50be + required: true + ../qtdeclarative: +- ref: 3037e442d289b1c4ff037ee02f683c199673af6f ++ ref: 88ac03de3dccc7f70f9a39b03e1405495cff8ba7 + required: false + ../qtshadertools: +- ref: 52734496e036413a030de950a8f824e42c169d96 ++ ref: cb5c2d28c2b28a7448897439b00269f890cd7eb4 + required: false +diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp +index c2814a79e..da87cbf1c 100644 +--- a/src/quick3d/quick3d/items/quick3dentity.cpp ++++ b/src/quick3d/quick3d/items/quick3dentity.cpp +@@ -97,13 +97,13 @@ void Quick3DEntity::qmlAppendComponent(QQmlListProperty *list, QComp + self->parentEntity()->addComponent(comp); + } + +-QComponent *Quick3DEntity::qmlComponentAt(QQmlListProperty *list, int index) ++QComponent *Quick3DEntity::qmlComponentAt(QQmlListProperty *list, qsizetype index) + { + Quick3DEntity *self = static_cast(list->object); + return self->parentEntity()->components().at(index); + } + +-int Quick3DEntity::qmlComponentsCount(QQmlListProperty *list) ++qsizetype Quick3DEntity::qmlComponentsCount(QQmlListProperty *list) + { + Quick3DEntity *self = static_cast(list->object); + return self->parentEntity()->components().count(); +diff --git a/src/quick3d/quick3d/items/quick3dentity_p.h b/src/quick3d/quick3d/items/quick3dentity_p.h +index 2ced2d141..ee62ecf59 100644 +--- a/src/quick3d/quick3d/items/quick3dentity_p.h ++++ b/src/quick3d/quick3d/items/quick3dentity_p.h +@@ -80,8 +80,8 @@ public: + private: + + static void qmlAppendComponent(QQmlListProperty *list, Qt3DCore::QComponent *comp); +- static QComponent *qmlComponentAt(QQmlListProperty *list, int index); +- static int qmlComponentsCount(QQmlListProperty *list); ++ static QComponent *qmlComponentAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype qmlComponentsCount(QQmlListProperty *list); + static void qmlClearComponents(QQmlListProperty *list); + + QList m_managedComponents; +diff --git a/src/quick3d/quick3d/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp +index 8e9e56fab..192b17b7e 100644 +--- a/src/quick3d/quick3d/items/quick3dgeometry.cpp ++++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp +@@ -65,13 +65,13 @@ void Quick3DGeometry::appendAttribute(QQmlListProperty *li + geometry->parentGeometry()->addAttribute(attribute); + } + +-Qt3DCore::QAttribute *Quick3DGeometry::attributeAt(QQmlListProperty *list, int index) ++Qt3DCore::QAttribute *Quick3DGeometry::attributeAt(QQmlListProperty *list, qsizetype index) + { + Quick3DGeometry *geometry = static_cast(list->object); + return geometry->parentGeometry()->attributes().at(index); + } + +-int Quick3DGeometry::attributesCount(QQmlListProperty *list) ++qsizetype Quick3DGeometry::attributesCount(QQmlListProperty *list) + { + Quick3DGeometry *geometry = static_cast(list->object); + return geometry->parentGeometry()->attributes().count(); +diff --git a/src/quick3d/quick3d/items/quick3dgeometry_p.h b/src/quick3d/quick3d/items/quick3dgeometry_p.h +index 5f7b001d6..8a4e5e16a 100644 +--- a/src/quick3d/quick3d/items/quick3dgeometry_p.h ++++ b/src/quick3d/quick3d/items/quick3dgeometry_p.h +@@ -75,8 +75,8 @@ public: + + private: + static void appendAttribute(QQmlListProperty *list, Qt3DCore::QAttribute *provider); +- static Qt3DCore::QAttribute *attributeAt(QQmlListProperty *list, int index); +- static int attributesCount(QQmlListProperty *list); ++ static Qt3DCore::QAttribute *attributeAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype attributesCount(QQmlListProperty *list); + static void clearAttributes(QQmlListProperty *list); + + QList m_managedAttributes; +diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp +index 810e37e1a..f59f3451e 100644 +--- a/src/quick3d/quick3d/items/quick3djoint.cpp ++++ b/src/quick3d/quick3d/items/quick3djoint.cpp +@@ -69,13 +69,13 @@ void Quick3DJoint::appendJoint(QQmlListProperty *list, QJoint *joint) + jointExtension->parentJoint()->addChildJoint(joint); + } + +-QJoint *Quick3DJoint::jointAt(QQmlListProperty *list, int index) ++QJoint *Quick3DJoint::jointAt(QQmlListProperty *list, qsizetype index) + { + Quick3DJoint *jointExtension = qobject_cast(list->object); + return jointExtension->parentJoint()->childJoints().at(index); + } + +-int Quick3DJoint::jointCount(QQmlListProperty *list) ++qsizetype Quick3DJoint::jointCount(QQmlListProperty *list) + { + Quick3DJoint *jointExtension = qobject_cast(list->object); + return jointExtension->parentJoint()->childJoints().count(); +diff --git a/src/quick3d/quick3d/items/quick3djoint_p.h b/src/quick3d/quick3d/items/quick3djoint_p.h +index d66419433..73dccc39d 100644 +--- a/src/quick3d/quick3d/items/quick3djoint_p.h ++++ b/src/quick3d/quick3d/items/quick3djoint_p.h +@@ -75,8 +75,8 @@ public: + + private: + static void appendJoint(QQmlListProperty *list, Qt3DCore::QJoint *obj); +- static QJoint *jointAt(QQmlListProperty *list, int index); +- static int jointCount(QQmlListProperty *list); ++ static QJoint *jointAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype jointCount(QQmlListProperty *list); + static void clearJoints(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp +index fb91f4ae0..67fe26b63 100644 +--- a/src/quick3d/quick3d/items/quick3dnode.cpp ++++ b/src/quick3d/quick3d/items/quick3dnode.cpp +@@ -97,13 +97,13 @@ void Quick3DNode::appendData(QQmlListProperty *list, QObject *obj) + self->childAppended(0, obj); + } + +-QObject *Quick3DNode::dataAt(QQmlListProperty *list, int index) ++QObject *Quick3DNode::dataAt(QQmlListProperty *list, qsizetype index) + { + Quick3DNode *self = static_cast(list->object); + return self->parentNode()->children().at(index); + } + +-int Quick3DNode::dataCount(QQmlListProperty *list) ++qsizetype Quick3DNode::dataCount(QQmlListProperty *list) + { + Quick3DNode *self = static_cast(list->object); + return self->parentNode()->children().count(); +@@ -127,13 +127,13 @@ void Quick3DNode::appendChild(QQmlListProperty *list, Qt3DCore: + self->childAppended(0, obj); + } + +-Qt3DCore::QNode *Quick3DNode::childAt(QQmlListProperty *list, int index) ++Qt3DCore::QNode *Quick3DNode::childAt(QQmlListProperty *list, qsizetype index) + { + Quick3DNode *self = static_cast(list->object); + return qobject_cast(self->parentNode()->children().at(index)); + } + +-int Quick3DNode::childCount(QQmlListProperty *list) ++qsizetype Quick3DNode::childCount(QQmlListProperty *list) + { + Quick3DNode *self = static_cast(list->object); + return self->parentNode()->children().count(); +diff --git a/src/quick3d/quick3d/items/quick3dnode_p.h b/src/quick3d/quick3d/items/quick3dnode_p.h +index 6b146d691..aa6cb788e 100644 +--- a/src/quick3d/quick3d/items/quick3dnode_p.h ++++ b/src/quick3d/quick3d/items/quick3dnode_p.h +@@ -77,13 +77,13 @@ public: + + private: + static void appendData(QQmlListProperty *list, QObject *obj); +- static QObject *dataAt(QQmlListProperty *list, int index); +- static int dataCount(QQmlListProperty *list); ++ static QObject *dataAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype dataCount(QQmlListProperty *list); + static void clearData(QQmlListProperty *list); + + static void appendChild(QQmlListProperty *list, Qt3DCore::QNode *obj); +- static QNode *childAt(QQmlListProperty *list, int index); +- static int childCount(QQmlListProperty *list); ++ static QNode *childAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype childCount(QQmlListProperty *list); + static void clearChildren(QQmlListProperty *list); + + private Q_SLOTS: +diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp +index 23f39460c..3d2fef555 100644 +--- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp ++++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp +@@ -63,7 +63,7 @@ void QQuick3DAnimationController::appendAnimationGroup(QQmlListPropertyparentAnimationController()->addAnimationGroup(bar); + } + +-int QQuick3DAnimationController::animationGroupCount(QQmlListProperty *list) ++qsizetype QQuick3DAnimationController::animationGroupCount(QQmlListProperty *list) + { + QQuick3DAnimationController *controller = qobject_cast(list->object); + if (controller) +@@ -71,7 +71,7 @@ int QQuick3DAnimationController::animationGroupCount(QQmlListProperty *list, int index) ++QAnimationGroup *QQuick3DAnimationController::animationGroupAt(QQmlListProperty *list, qsizetype index) + { + QQuick3DAnimationController *controller = qobject_cast(list->object); + if (controller) +diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h +index d6add010d..ee5d643c6 100644 +--- a/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h ++++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller_p.h +@@ -76,8 +76,8 @@ public: + private: + + static void appendAnimationGroup(QQmlListProperty *list, Qt3DAnimation::QAnimationGroup *bar); +- static QAnimationGroup *animationGroupAt(QQmlListProperty *list, int index); +- static int animationGroupCount(QQmlListProperty *list); ++ static QAnimationGroup *animationGroupAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype animationGroupCount(QQmlListProperty *list); + static void clearAnimationGroups(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp +index b7ad3b3bc..090b7a959 100644 +--- a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp ++++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp +@@ -66,7 +66,7 @@ void QQuick3DAnimationGroup::appendAnimation(QQmlListPropertyparentAnimationGroup()->addAnimation(animation); + } + +-int QQuick3DAnimationGroup::animationCount(QQmlListProperty *list) ++qsizetype QQuick3DAnimationGroup::animationCount(QQmlListProperty *list) + { + QQuick3DAnimationGroup *animationGroup = qobject_cast(list->object); + if (animationGroup) +@@ -74,7 +74,7 @@ int QQuick3DAnimationGroup::animationCount(QQmlListProperty *list, int index) ++Qt3DAnimation::QAbstractAnimation *QQuick3DAnimationGroup::animationAt(QQmlListProperty *list, qsizetype index) + { + QQuick3DAnimationGroup *animationGroup = qobject_cast(list->object); + if (animationGroup) { +diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h +index 53b25cf67..6c7f634a3 100644 +--- a/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h ++++ b/src/quick3d/quick3danimation/items/quick3danimationgroup_p.h +@@ -78,8 +78,8 @@ public: + private: + + static void appendAnimation(QQmlListProperty *list, Qt3DAnimation::QAbstractAnimation *animation); +- static Qt3DAnimation::QAbstractAnimation *animationAt(QQmlListProperty *list, int index); +- static int animationCount(QQmlListProperty *list); ++ static Qt3DAnimation::QAbstractAnimation *animationAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype animationCount(QQmlListProperty *list); + static void clearAnimation(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp +index 66ee7faef..a2bc51d45 100644 +--- a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp ++++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp +@@ -65,13 +65,13 @@ void Quick3DChannelMapper::appendMapping(QQmlListPropertyparentMapper()->addMapping(mapping); + } + +-QAbstractChannelMapping *Quick3DChannelMapper::mappingAt(QQmlListProperty *list, int index) ++QAbstractChannelMapping *Quick3DChannelMapper::mappingAt(QQmlListProperty *list, qsizetype index) + { + Quick3DChannelMapper *extension = qobject_cast(list->object); + return extension->parentMapper()->mappings().at(index); + } + +-int Quick3DChannelMapper::mappingCount(QQmlListProperty *list) ++qsizetype Quick3DChannelMapper::mappingCount(QQmlListProperty *list) + { + Quick3DChannelMapper *extension = qobject_cast(list->object); + return extension->parentMapper()->mappings().count(); +diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h +index a21a67411..ab7b6fdbe 100644 +--- a/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h ++++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper_p.h +@@ -76,8 +76,8 @@ public: + + private: + static void appendMapping(QQmlListProperty *list, QAbstractChannelMapping *mapping); +- static QAbstractChannelMapping *mappingAt(QQmlListProperty *list, int index); +- static int mappingCount(QQmlListProperty *list); ++ static QAbstractChannelMapping *mappingAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype mappingCount(QQmlListProperty *list); + static void clearMappings(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp +index 0137f85ff..61bc14a4f 100644 +--- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp ++++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp +@@ -49,10 +49,10 @@ QQuick3DKeyframeAnimation::QQuick3DKeyframeAnimation(QObject *parent) + QQmlListProperty QQuick3DKeyframeAnimation::keyframes() + { + return QQmlListProperty(this, 0, +- &QQuick3DKeyframeAnimation::appendKeyframe, +- &QQuick3DKeyframeAnimation::keyframeCount, +- &QQuick3DKeyframeAnimation::keyframeAt, +- &QQuick3DKeyframeAnimation::clearKeyframes); ++ &QQuick3DKeyframeAnimation::appendKeyframe, ++ &QQuick3DKeyframeAnimation::keyframeCount, ++ &QQuick3DKeyframeAnimation::keyframeAt, ++ &QQuick3DKeyframeAnimation::clearKeyframes); + } + + void QQuick3DKeyframeAnimation::appendKeyframe(QQmlListProperty *list, +@@ -64,7 +64,7 @@ void QQuick3DKeyframeAnimation::appendKeyframe(QQmlListPropertyparentKeyframeAnimation()->addKeyframe(transform); + } + +-int QQuick3DKeyframeAnimation::keyframeCount(QQmlListProperty *list) ++qsizetype QQuick3DKeyframeAnimation::keyframeCount(QQmlListProperty *list) + { + QQuick3DKeyframeAnimation *keyframeAnimation + = qobject_cast(list->object); +@@ -74,7 +74,7 @@ int QQuick3DKeyframeAnimation::keyframeCount(QQmlListProperty *list, +- int index) ++ qsizetype index) + { + QQuick3DKeyframeAnimation *keyframeAnimation + = qobject_cast(list->object); +diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h +index b4eda766c..488d91c39 100644 +--- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h ++++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation_p.h +@@ -79,8 +79,8 @@ private: + static void appendKeyframe(QQmlListProperty *list, + Qt3DCore::QTransform *transform); + static Qt3DCore::QTransform *keyframeAt(QQmlListProperty *list, +- int index); +- static int keyframeCount(QQmlListProperty *list); ++ qsizetype index); ++ static qsizetype keyframeCount(QQmlListProperty *list); + static void clearKeyframes(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp +index afe15b914..5e25c00c5 100644 +--- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp ++++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp +@@ -63,7 +63,7 @@ void QQuick3DMorphingAnimation::appendMorphTarget(QQmlListPropertyparentMorphingAnimation()->addMorphTarget(morphTarget); + } + +-int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty *list) ++qsizetype QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty *list) + { + QQuick3DMorphingAnimation *animation = qobject_cast(list->object); + if (animation) +@@ -72,7 +72,7 @@ int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty *list, +- int index) ++ qsizetype index) + { + QQuick3DMorphingAnimation *animation = qobject_cast(list->object); + if (animation) { +diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h +index 3ba018473..465addead 100644 +--- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h ++++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation_p.h +@@ -79,8 +79,8 @@ private: + static void appendMorphTarget(QQmlListProperty *list, + Qt3DAnimation::QMorphTarget *morphTarget); + static Qt3DAnimation::QMorphTarget *morphTargetAt(QQmlListProperty *list, +- int index); +- static int morphTargetCount(QQmlListProperty *list); ++ qsizetype index); ++ static qsizetype morphTargetCount(QQmlListProperty *list); + static void clearMorphTargets(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp +index b1bb76f1c..06933331f 100644 +--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp ++++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp +@@ -62,7 +62,7 @@ void QQuick3DMorphTarget::appendAttribute(QQmlListProperty + target->parentMorphTarget()->addAttribute(bar); + } + +-int QQuick3DMorphTarget::attributeCount(QQmlListProperty *list) ++qsizetype QQuick3DMorphTarget::attributeCount(QQmlListProperty *list) + { + QQuick3DMorphTarget *target = qobject_cast(list->object); + if (target) +@@ -70,7 +70,7 @@ int QQuick3DMorphTarget::attributeCount(QQmlListProperty * + return 0; + } + +-Qt3DCore::QAttribute *QQuick3DMorphTarget::attributeAt(QQmlListProperty *list, int index) ++Qt3DCore::QAttribute *QQuick3DMorphTarget::attributeAt(QQmlListProperty *list, qsizetype index) + { + QQuick3DMorphTarget *target = qobject_cast(list->object); + if (target) +diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h +index d68a795e9..172202e5c 100644 +--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h ++++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget_p.h +@@ -72,8 +72,8 @@ public: + private: + + static void appendAttribute(QQmlListProperty *list, Qt3DCore::QAttribute *bar); +- static Qt3DCore::QAttribute *attributeAt(QQmlListProperty *list, int index); +- static int attributeCount(QQmlListProperty *list); ++ static Qt3DCore::QAttribute *attributeAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype attributeCount(QQmlListProperty *list); + static void clearAttributes(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp +index 48b361e39..bd62e35e4 100644 +--- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp ++++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp +@@ -65,7 +65,7 @@ void QQuick3DVertexBlendAnimation::appendMorphTarget( + animation->parentVertexBlendAnimation()->addMorphTarget(morphTarget); + } + +-int QQuick3DVertexBlendAnimation::morphTargetCount( ++qsizetype QQuick3DVertexBlendAnimation::morphTargetCount( + QQmlListProperty *list) + { + QQuick3DVertexBlendAnimation *animation +@@ -77,7 +77,7 @@ int QQuick3DVertexBlendAnimation::morphTargetCount( + + Qt3DAnimation::QMorphTarget *QQuick3DVertexBlendAnimation::morphTargetAt( + QQmlListProperty *list, +- int index) ++ qsizetype index) + { + QQuick3DVertexBlendAnimation *animation + = qobject_cast(list->object); +diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h +index f33730fb5..bea39deb7 100644 +--- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h ++++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h +@@ -78,10 +78,9 @@ private: + + static void appendMorphTarget(QQmlListProperty *list, + Qt3DAnimation::QMorphTarget *morphTarget); +- static Qt3DAnimation::QMorphTarget *morphTargetAt( +- QQmlListProperty *list, +- int index); +- static int morphTargetCount(QQmlListProperty *list); ++ static Qt3DAnimation::QMorphTarget *morphTargetAt(QQmlListProperty *list, ++ qsizetype index); ++ static qsizetype morphTargetCount(QQmlListProperty *list); + static void clearMorphTargets(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp +index a38581cc7..e0b5d77b6 100644 +--- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp ++++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp +@@ -72,13 +72,13 @@ void Quick3DSpriteSheet::appendSprite(QQmlListPropertyparentSpriteSheet()->addSprite(sprite); + } + +-Qt3DExtras::QSpriteSheetItem *Quick3DSpriteSheet::spriteAt(QQmlListProperty *list, int index) ++Qt3DExtras::QSpriteSheetItem *Quick3DSpriteSheet::spriteAt(QQmlListProperty *list, qsizetype index) + { + Quick3DSpriteSheet *spritesheet = qobject_cast(list->object); + return spritesheet->parentSpriteSheet()->sprites().at(index); + } + +-int Quick3DSpriteSheet::spriteCount(QQmlListProperty *list) ++qsizetype Quick3DSpriteSheet::spriteCount(QQmlListProperty *list) + { + Quick3DSpriteSheet *spritesheet = qobject_cast(list->object); + return spritesheet->parentSpriteSheet()->sprites().count(); +diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h +index 82409b755..e04231417 100644 +--- a/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h ++++ b/src/quick3d/quick3dextras/items/quick3dspritesheet_p.h +@@ -75,8 +75,8 @@ public: + + private: + static void appendSprite(QQmlListProperty *list, Qt3DExtras::QSpriteSheetItem *state); +- static Qt3DExtras::QSpriteSheetItem *spriteAt(QQmlListProperty *list, int index); +- static int spriteCount(QQmlListProperty *list); ++ static Qt3DExtras::QSpriteSheetItem *spriteAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype spriteCount(QQmlListProperty *list); + static void clearSprites(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp +index 33752c6e0..e46153551 100644 +--- a/src/quick3d/quick3dinput/items/quick3daction.cpp ++++ b/src/quick3d/quick3dinput/items/quick3daction.cpp +@@ -65,13 +65,13 @@ void Quick3DAction::appendActionInput(QQmlListProperty *li + action->parentAction()->addInput(input); + } + +-QAbstractActionInput *Quick3DAction::actionInputAt(QQmlListProperty *list, int index) ++QAbstractActionInput *Quick3DAction::actionInputAt(QQmlListProperty *list, qsizetype index) + { + Quick3DAction *action = qobject_cast(list->object); + return action->parentAction()->inputs().at(index); + } + +-int Quick3DAction::actionInputCount(QQmlListProperty *list) ++qsizetype Quick3DAction::actionInputCount(QQmlListProperty *list) + { + Quick3DAction *action = qobject_cast(list->object); + return action->parentAction()->inputs().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3daction_p.h b/src/quick3d/quick3dinput/items/quick3daction_p.h +index 8fb91ed40..8d3b233ca 100644 +--- a/src/quick3d/quick3dinput/items/quick3daction_p.h ++++ b/src/quick3d/quick3dinput/items/quick3daction_p.h +@@ -76,8 +76,8 @@ public: + + private: + static void appendActionInput(QQmlListProperty *list, QAbstractActionInput *input); +- static QAbstractActionInput *actionInputAt(QQmlListProperty *list, int index); +- static int actionInputCount(QQmlListProperty *list); ++ static QAbstractActionInput *actionInputAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype actionInputCount(QQmlListProperty *list); + static void clearActionInputs(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp +index 966aa250d..86ad22f25 100644 +--- a/src/quick3d/quick3dinput/items/quick3daxis.cpp ++++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp +@@ -65,13 +65,13 @@ void Quick3DAxis::appendAxisInput(QQmlListProperty *list, QA + axis->parentAxis()->addInput(input); + } + +-QAbstractAxisInput *Quick3DAxis::axisInputAt(QQmlListProperty *list, int index) ++QAbstractAxisInput *Quick3DAxis::axisInputAt(QQmlListProperty *list, qsizetype index) + { + Quick3DAxis *axis = qobject_cast(list->object); + return axis->parentAxis()->inputs().at(index); + } + +-int Quick3DAxis::axesInputCount(QQmlListProperty *list) ++qsizetype Quick3DAxis::axesInputCount(QQmlListProperty *list) + { + Quick3DAxis *axis = qobject_cast(list->object); + return axis->parentAxis()->inputs().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3daxis_p.h b/src/quick3d/quick3dinput/items/quick3daxis_p.h +index 631139212..5f7785a3b 100644 +--- a/src/quick3d/quick3dinput/items/quick3daxis_p.h ++++ b/src/quick3d/quick3dinput/items/quick3daxis_p.h +@@ -76,8 +76,8 @@ public: + + private: + static void appendAxisInput(QQmlListProperty *list, QAbstractAxisInput *input); +- static QAbstractAxisInput *axisInputAt(QQmlListProperty *list, int index); +- static int axesInputCount(QQmlListProperty *list); ++ static QAbstractAxisInput *axisInputAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype axesInputCount(QQmlListProperty *list); + static void clearAxisInputs(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp +index 16a5e8181..684e2f283 100644 +--- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp ++++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp +@@ -53,10 +53,10 @@ Quick3DInputChord::Quick3DInputChord(QObject *parent) + QQmlListProperty Quick3DInputChord::qmlActionInputs() + { + return QQmlListProperty(this, 0, +- &Quick3DInputChord::appendActionInput, +- &Quick3DInputChord::actionInputCount, +- &Quick3DInputChord::actionInputAt, +- &Quick3DInputChord::clearActionInputs); ++ &Quick3DInputChord::appendActionInput, ++ &Quick3DInputChord::actionInputCount, ++ &Quick3DInputChord::actionInputAt, ++ &Quick3DInputChord::clearActionInputs); + } + + void Quick3DInputChord::appendActionInput(QQmlListProperty *list, QAbstractActionInput *input) +@@ -65,13 +65,13 @@ void Quick3DInputChord::appendActionInput(QQmlListProperty + action->parentChord()->addChord(input); + } + +-QAbstractActionInput *Quick3DInputChord::actionInputAt(QQmlListProperty *list, int index) ++QAbstractActionInput *Quick3DInputChord::actionInputAt(QQmlListProperty *list, qsizetype index) + { + Quick3DInputChord *action = qobject_cast(list->object); + return action->parentChord()->chords().at(index); + } + +-int Quick3DInputChord::actionInputCount(QQmlListProperty *list) ++qsizetype Quick3DInputChord::actionInputCount(QQmlListProperty *list) + { + Quick3DInputChord *action = qobject_cast(list->object); + return action->parentChord()->chords().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h +index 5bfd15b09..1ce165cf1 100644 +--- a/src/quick3d/quick3dinput/items/quick3dinputchord_p.h ++++ b/src/quick3d/quick3dinput/items/quick3dinputchord_p.h +@@ -74,8 +74,8 @@ public: + + private: + static void appendActionInput(QQmlListProperty *list, QAbstractActionInput *input); +- static QAbstractActionInput *actionInputAt(QQmlListProperty *list, int index); +- static int actionInputCount(QQmlListProperty *list); ++ static QAbstractActionInput *actionInputAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype actionInputCount(QQmlListProperty *list); + static void clearActionInputs(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp +index 4f4eed9d3..eaf3582b6 100644 +--- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp ++++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp +@@ -65,13 +65,13 @@ void Quick3DInputSequence::appendActionInput(QQmlListPropertyparentSequence()->addSequence(input); + } + +-QAbstractActionInput *Quick3DInputSequence::actionInputAt(QQmlListProperty *list, int index) ++QAbstractActionInput *Quick3DInputSequence::actionInputAt(QQmlListProperty *list, qsizetype index) + { + Quick3DInputSequence *action = qobject_cast(list->object); + return action->parentSequence()->sequences().at(index); + } + +-int Quick3DInputSequence::actionInputCount(QQmlListProperty *list) ++qsizetype Quick3DInputSequence::actionInputCount(QQmlListProperty *list) + { + Quick3DInputSequence *action = qobject_cast(list->object); + return action->parentSequence()->sequences().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h +index 54e40ec42..9aedce8a0 100644 +--- a/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h ++++ b/src/quick3d/quick3dinput/items/quick3dinputsequence_p.h +@@ -74,8 +74,8 @@ public: + + private: + static void appendActionInput(QQmlListProperty *list, QAbstractActionInput *input); +- static QAbstractActionInput *actionInputAt(QQmlListProperty *list, int index); +- static int actionInputCount(QQmlListProperty *list); ++ static QAbstractActionInput *actionInputAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype actionInputCount(QQmlListProperty *list); + static void clearActionInputs(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp +index 50218dd25..df52cf8c8 100644 +--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp ++++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp +@@ -74,13 +74,13 @@ void Quick3DLogicalDevice::appendAxis(QQmlListProperty *list, QAxis *axes + device->parentLogicalDevice()->addAxis(axes); + } + +-QAxis *Quick3DLogicalDevice::axisAt(QQmlListProperty *list, int index) ++QAxis *Quick3DLogicalDevice::axisAt(QQmlListProperty *list, qsizetype index) + { + Quick3DLogicalDevice *device = qobject_cast(list->object); + return device->parentLogicalDevice()->axes().at(index); + } + +-int Quick3DLogicalDevice::axesCount(QQmlListProperty *list) ++qsizetype Quick3DLogicalDevice::axesCount(QQmlListProperty *list) + { + Quick3DLogicalDevice *device = qobject_cast(list->object); + return device->parentLogicalDevice()->axes().count(); +@@ -100,13 +100,13 @@ void Quick3DLogicalDevice::appendAction(QQmlListProperty *list, QAction + device->parentLogicalDevice()->addAction(action); + } + +-QAction *Quick3DLogicalDevice::actionAt(QQmlListProperty *list, int index) ++QAction *Quick3DLogicalDevice::actionAt(QQmlListProperty *list, qsizetype index) + { + Quick3DLogicalDevice *device = qobject_cast(list->object); + return device->parentLogicalDevice()->actions().at(index); + } + +-int Quick3DLogicalDevice::actionCount(QQmlListProperty *list) ++qsizetype Quick3DLogicalDevice::actionCount(QQmlListProperty *list) + { + Quick3DLogicalDevice *device = qobject_cast(list->object); + return device->parentLogicalDevice()->actions().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h +index e544bbc14..6e28ce349 100644 +--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h ++++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice_p.h +@@ -78,13 +78,13 @@ public: + + private: + static void appendAxis(QQmlListProperty *list, QAxis *axes); +- static QAxis *axisAt(QQmlListProperty *list, int index); +- static int axesCount(QQmlListProperty *list); ++ static QAxis *axisAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype axesCount(QQmlListProperty *list); + static void clearAxes(QQmlListProperty *list); + + static void appendAction(QQmlListProperty *list, QAction *action); +- static QAction *actionAt(QQmlListProperty *list, int index); +- static int actionCount(QQmlListProperty *list); ++ static QAction *actionAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype actionCount(QQmlListProperty *list); + static void clearActions(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp +index 5c8d55b54..dc1fdcf6d 100644 +--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp ++++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp +@@ -65,13 +65,13 @@ void Quick3DPhysicalDevice::appendAxisSetting(QQmlListProperty *li + device->parentPhysicalDevice()->addAxisSetting(axisSetting); + } + +-QAxisSetting *Quick3DPhysicalDevice::axisSettingAt(QQmlListProperty *list, int index) ++QAxisSetting *Quick3DPhysicalDevice::axisSettingAt(QQmlListProperty *list, qsizetype index) + { + Quick3DPhysicalDevice *device = qobject_cast(list->object); + return device->parentPhysicalDevice()->axisSettings().at(index); + } + +-int Quick3DPhysicalDevice::axisSettingsCount(QQmlListProperty *list) ++qsizetype Quick3DPhysicalDevice::axisSettingsCount(QQmlListProperty *list) + { + Quick3DPhysicalDevice *device = qobject_cast(list->object); + return device->parentPhysicalDevice()->axisSettings().count(); +diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h +index 0c0940952..fff0deca7 100644 +--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h ++++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice_p.h +@@ -76,8 +76,8 @@ public: + + private: + static void appendAxisSetting(QQmlListProperty *list, QAxisSetting *axes); +- static QAxisSetting *axisSettingAt(QQmlListProperty *list, int index); +- static int axisSettingsCount(QQmlListProperty *list); ++ static QAxisSetting *axisSettingAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype axisSettingsCount(QQmlListProperty *list); + static void clearAxisSettings(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp +index fa82c6eff..617b52e85 100644 +--- a/src/quick3d/quick3drender/items/quick3deffect.cpp ++++ b/src/quick3d/quick3drender/items/quick3deffect.cpp +@@ -78,7 +78,7 @@ void Quick3DEffect::appendTechnique(QQmlListProperty *list, QTechniq + } + + // TO DO : Return a QAbstractTechnique once properly defined +-QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty *list, int index) ++QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty *list, qsizetype index) + { + Quick3DEffect *eff = qobject_cast(list->object); + if (eff) +@@ -86,7 +86,7 @@ QTechnique *Quick3DEffect::techniqueAt(QQmlListProperty *list, int i + return nullptr; + } + +-int Quick3DEffect::techniqueCount(QQmlListProperty *list) ++qsizetype Quick3DEffect::techniqueCount(QQmlListProperty *list) + { + Quick3DEffect *eff = qobject_cast(list->object); + if (eff) +@@ -112,13 +112,13 @@ void Quick3DEffect::appendParameter(QQmlListProperty *list, QParamet + qobject_cast(effect->parentEffect())->addParameter(param); + } + +-QParameter *Quick3DEffect::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DEffect::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DEffect *effect = qobject_cast(list->object); + return qobject_cast(effect->parentEffect())->parameters().at(index); + } + +-int Quick3DEffect::parametersCount(QQmlListProperty *list) ++qsizetype Quick3DEffect::parametersCount(QQmlListProperty *list) + { + Quick3DEffect *effect = qobject_cast(list->object); + return qobject_cast(effect->parentEffect())->parameters().count(); +diff --git a/src/quick3d/quick3drender/items/quick3deffect_p.h b/src/quick3d/quick3drender/items/quick3deffect_p.h +index 69c5b2be6..fb6fa2bdd 100644 +--- a/src/quick3d/quick3drender/items/quick3deffect_p.h ++++ b/src/quick3d/quick3drender/items/quick3deffect_p.h +@@ -79,13 +79,13 @@ public: + + private: + static void appendTechnique(QQmlListProperty *list, QTechnique *bar); +- static QTechnique *techniqueAt(QQmlListProperty *list, int index); +- static int techniqueCount(QQmlListProperty *list); ++ static QTechnique *techniqueAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype techniqueCount(QQmlListProperty *list); + static void clearTechniqueList(QQmlListProperty *list); + + static void appendParameter(QQmlListProperty *list, QParameter *param); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parametersCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parametersCount(QQmlListProperty *list); + static void clearParameterList(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp +index 951b4f82f..505495eb3 100644 +--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp ++++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp +@@ -71,7 +71,7 @@ void Quick3DLayerFilter::appendLayer(QQmlListProperty *list, QLayer *lay + } + } + +-QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty *list, int index) ++QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty *list, qsizetype index) + { + Quick3DLayerFilter *filter = qobject_cast(list->object); + if (filter) { +@@ -80,7 +80,7 @@ QLayer *Quick3DLayerFilter::layerAt(QQmlListProperty *list, int index) + return 0; + } + +-int Quick3DLayerFilter::layerCount(QQmlListProperty *list) ++qsizetype Quick3DLayerFilter::layerCount(QQmlListProperty *list) + { + Quick3DLayerFilter *filter = qobject_cast(list->object); + if (filter) { +diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h +index 6294d2b98..3bcb6aaa2 100644 +--- a/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h ++++ b/src/quick3d/quick3drender/items/quick3dlayerfilter_p.h +@@ -77,8 +77,8 @@ public: + + private: + static void appendLayer(QQmlListProperty *list, QLayer *bar); +- static QLayer *layerAt(QQmlListProperty *list, int index); +- static int layerCount(QQmlListProperty *list); ++ static QLayer *layerAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype layerCount(QQmlListProperty *list); + static void clearLayers(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp +index 3dfbec83e..4e5cc1947 100644 +--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp ++++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp +@@ -72,7 +72,7 @@ void Quick3DMaterial::appendParameter(QQmlListProperty *list, QParam + } + } + +-QParameter *Quick3DMaterial::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DMaterial::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DMaterial *mat = qobject_cast(list->object); + if (mat) +@@ -80,7 +80,7 @@ QParameter *Quick3DMaterial::parameterAt(QQmlListProperty *list, int + return 0; + } + +-int Quick3DMaterial::parameterCount(QQmlListProperty *list) ++qsizetype Quick3DMaterial::parameterCount(QQmlListProperty *list) + { + Quick3DMaterial *mat = qobject_cast(list->object); + if (mat) +diff --git a/src/quick3d/quick3drender/items/quick3dmaterial_p.h b/src/quick3d/quick3drender/items/quick3dmaterial_p.h +index 2069ba9c6..adb0d066b 100644 +--- a/src/quick3d/quick3drender/items/quick3dmaterial_p.h ++++ b/src/quick3d/quick3drender/items/quick3dmaterial_p.h +@@ -83,8 +83,8 @@ public: + private: + // FIXME - remove when we have a custom QML parser + static void appendParameter(QQmlListProperty *list, QParameter *bar); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parameterCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parameterCount(QQmlListProperty *list); + static void clearParameters(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3draycaster.cpp b/src/quick3d/quick3drender/items/quick3draycaster.cpp +index d0c282a1c..dad28bbbe 100644 +--- a/src/quick3d/quick3drender/items/quick3draycaster.cpp ++++ b/src/quick3d/quick3drender/items/quick3draycaster.cpp +@@ -56,7 +56,7 @@ void Quick3DRayCasterPrivate::appendLayer(QQmlListProperty *list, QLayer + filter->addLayer(layer); + } + +-QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty *list, int index) ++QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty *list, qsizetype index) + { + QAbstractRayCaster *filter = qobject_cast(list->object); + if (filter) +@@ -64,7 +64,7 @@ QLayer *Quick3DRayCasterPrivate::layerAt(QQmlListProperty *list, int ind + return nullptr; + } + +-int Quick3DRayCasterPrivate::layerCount(QQmlListProperty *list) ++qsizetype Quick3DRayCasterPrivate::layerCount(QQmlListProperty *list) + { + QAbstractRayCaster *filter = qobject_cast(list->object); + if (filter) +diff --git a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h +index dec8dcfb6..096cae351 100644 +--- a/src/quick3d/quick3drender/items/quick3draycaster_p_p.h ++++ b/src/quick3d/quick3drender/items/quick3draycaster_p_p.h +@@ -69,8 +69,8 @@ public: + explicit Quick3DRayCasterPrivate() : QAbstractRayCasterPrivate() { } + + static void appendLayer(QQmlListProperty *list, QLayer *bar); +- static QLayer *layerAt(QQmlListProperty *list, int index); +- static int layerCount(QQmlListProperty *list); ++ static QLayer *layerAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype layerCount(QQmlListProperty *list); + static void clearLayers(QQmlListProperty *list); + + Q_DECLARE_PUBLIC(Quick3DRayCaster) +diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp +index 7bd50a0d5..e05bd9c74 100644 +--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp ++++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp +@@ -84,13 +84,13 @@ void Quick3DRenderPass::appendFilterKey(QQmlListProperty *list, QFil + rPass->parentRenderPass()->addFilterKey(filterKey); + } + +-QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty *list, int index) ++QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->filterKeys().at(index); + } + +-int Quick3DRenderPass::filterKeysCount(QQmlListProperty *list) ++qsizetype Quick3DRenderPass::filterKeysCount(QQmlListProperty *list) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->filterKeys().count(); +@@ -110,13 +110,13 @@ void Quick3DRenderPass::appendRenderState(QQmlListProperty *list, + rPass->parentRenderPass()->addRenderState(state); + } + +-QRenderState *Quick3DRenderPass::renderStateAt(QQmlListProperty *list, int index) ++QRenderState *Quick3DRenderPass::renderStateAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->renderStates().at(index); + } + +-int Quick3DRenderPass::renderStateCount(QQmlListProperty *list) ++qsizetype Quick3DRenderPass::renderStateCount(QQmlListProperty *list) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->renderStates().count(); +@@ -136,13 +136,13 @@ void Quick3DRenderPass::appendParameter(QQmlListProperty *list, QPar + rPass->parentRenderPass()->addParameter(param); + } + +-QParameter *Quick3DRenderPass::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DRenderPass::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->parameters().at(index); + } + +-int Quick3DRenderPass::parametersCount(QQmlListProperty *list) ++qsizetype Quick3DRenderPass::parametersCount(QQmlListProperty *list) + { + Quick3DRenderPass *rPass = qobject_cast(list->object); + return rPass->parentRenderPass()->parameters().count(); +diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h +index 982cab9f4..58ef251ff 100644 +--- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h ++++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h +@@ -80,18 +80,18 @@ public: + + private: + static void appendFilterKey(QQmlListProperty *list, QFilterKey *filterKey); +- static QFilterKey *filterKeyAt(QQmlListProperty *list, int index); +- static int filterKeysCount(QQmlListProperty *list); ++ static QFilterKey *filterKeyAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype filterKeysCount(QQmlListProperty *list); + static void clearFilterKey(QQmlListProperty *list); + + static void appendRenderState(QQmlListProperty *list, QRenderState *state); +- static QRenderState *renderStateAt(QQmlListProperty *list, int index); +- static int renderStateCount(QQmlListProperty *list); ++ static QRenderState *renderStateAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype renderStateCount(QQmlListProperty *list); + static void clearRenderStates(QQmlListProperty *list); + + static void appendParameter(QQmlListProperty *list, QParameter *param); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parametersCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parametersCount(QQmlListProperty *list); + static void clearParameterList(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +index 0a8fa8a3a..5cf45b4a8 100644 +--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp ++++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +@@ -78,7 +78,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty *list, + } + } + +-QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty *list, int index) ++QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderPassFilter *filter = qobject_cast(list->object); + if (filter) +@@ -86,7 +86,7 @@ QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty *lis + return 0; + } + +-int Quick3DRenderPassFilter::includesCount(QQmlListProperty *list) ++qsizetype Quick3DRenderPassFilter::includesCount(QQmlListProperty *list) + { + Quick3DRenderPassFilter *filter = qobject_cast(list->object); + if (filter) +@@ -110,13 +110,13 @@ void Quick3DRenderPassFilter::appendParameter(QQmlListProperty *list + rPassFilter->parentRenderPassFilter()->addParameter(param); + } + +-QParameter *Quick3DRenderPassFilter::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DRenderPassFilter::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderPassFilter *rPassFilter = qobject_cast(list->object); + return rPassFilter->parentRenderPassFilter()->parameters().at(index); + } + +-int Quick3DRenderPassFilter::parametersCount(QQmlListProperty *list) ++qsizetype Quick3DRenderPassFilter::parametersCount(QQmlListProperty *list) + { + Quick3DRenderPassFilter *rPassFilter = qobject_cast(list->object); + return rPassFilter->parentRenderPassFilter()->parameters().count(); +diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h +index 8f81766ef..1f13f1d2f 100644 +--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h ++++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h +@@ -80,13 +80,13 @@ public: + + private: + static void appendInclude(QQmlListProperty *list, QFilterKey *criterion); +- static QFilterKey *includeAt(QQmlListProperty *list, int index); +- static int includesCount(QQmlListProperty *list); ++ static QFilterKey *includeAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype includesCount(QQmlListProperty *list); + static void clearIncludes(QQmlListProperty *list); + + static void appendParameter(QQmlListProperty *list, QParameter *param); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parametersCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parametersCount(QQmlListProperty *list); + static void clearParameterList(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp +index 024789a4c..5d35e7e00 100644 +--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp ++++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp +@@ -66,7 +66,7 @@ void Quick3DRenderTargetOutput::appendRenderAttachment(QQmlListPropertyparentRenderTarget()->addOutput(output); + } + +-QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty *list, int index) ++QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty *list, qsizetype index) + { + Quick3DRenderTargetOutput *rT = qobject_cast(list->object); + if (rT) +@@ -74,7 +74,7 @@ QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListPrope + return nullptr; + } + +-int Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty *list) ++qsizetype Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty *list) + { + Quick3DRenderTargetOutput *rT = qobject_cast(list->object); + if (rT) +diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h +index f7b15b0cb..076d034ed 100644 +--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h ++++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput_p.h +@@ -75,8 +75,8 @@ public: + + private: + static void appendRenderAttachment(QQmlListProperty *list, QRenderTargetOutput *attachment); +- static QRenderTargetOutput *renderAttachmentAt(QQmlListProperty *list, int index); +- static int renderAttachmentCount(QQmlListProperty *list); ++ static QRenderTargetOutput *renderAttachmentAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype renderAttachmentCount(QQmlListProperty *list); + static void clearRenderAttachments(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +index 36681b021..51e8911a6 100644 +--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp ++++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +@@ -91,13 +91,13 @@ void Quick3DShaderDataArray::appendValue(QQmlListProperty *list, QS + static_cast(Quick3DShaderDataArrayPrivate::get(self))->m_values.append(bar); + } + +-QShaderData *Quick3DShaderDataArray::valueAt(QQmlListProperty *list, int index) ++QShaderData *Quick3DShaderDataArray::valueAt(QQmlListProperty *list, qsizetype index) + { + Quick3DShaderDataArray *self = static_cast(list->object); + return static_cast(Quick3DShaderDataArrayPrivate::get(self))->m_values.at(index); + } + +-int Quick3DShaderDataArray::valueCount(QQmlListProperty *list) ++qsizetype Quick3DShaderDataArray::valueCount(QQmlListProperty *list) + { + Quick3DShaderDataArray *self = static_cast(list->object); + return static_cast(Quick3DShaderDataArrayPrivate::get(self))->m_values.count(); +diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +index a7c7ae833..4a1347cf8 100644 +--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h ++++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray_p.h +@@ -82,8 +82,8 @@ public: + + private: + static void appendValue(QQmlListProperty *list, QShaderData *bar); +- static QShaderData *valueAt(QQmlListProperty *list, int index); +- static int valueCount(QQmlListProperty *list); ++ static QShaderData *valueAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype valueCount(QQmlListProperty *list); + static void clearValues(QQmlListProperty *list); + Q_DECLARE_PRIVATE(Quick3DShaderDataArray) + }; +diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp +index 468364493..49fa0b96a 100644 +--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp ++++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp +@@ -70,13 +70,13 @@ void Quick3DStateSet::appendRenderState(QQmlListProperty *list, QR + stateSet->parentStateSet()->addRenderState(state); + } + +-QRenderState *Quick3DStateSet::renderStateAt(QQmlListProperty *list, int index) ++QRenderState *Quick3DStateSet::renderStateAt(QQmlListProperty *list, qsizetype index) + { + Quick3DStateSet *stateSet = qobject_cast(list->object); + return stateSet->parentStateSet()->renderStates().at(index); + } + +-int Quick3DStateSet::renderStateCount(QQmlListProperty *list) ++qsizetype Quick3DStateSet::renderStateCount(QQmlListProperty *list) + { + Quick3DStateSet *stateSet = qobject_cast(list->object); + return stateSet->parentStateSet()->renderStates().count(); +diff --git a/src/quick3d/quick3drender/items/quick3dstateset_p.h b/src/quick3d/quick3drender/items/quick3dstateset_p.h +index 7b532ec83..4d060e149 100644 +--- a/src/quick3d/quick3drender/items/quick3dstateset_p.h ++++ b/src/quick3d/quick3drender/items/quick3dstateset_p.h +@@ -75,8 +75,8 @@ public: + + private: + static void appendRenderState(QQmlListProperty *list, QRenderState *state); +- static QRenderState *renderStateAt(QQmlListProperty *list, int index); +- static int renderStateCount(QQmlListProperty *list); ++ static QRenderState *renderStateAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype renderStateCount(QQmlListProperty *list); + static void clearRenderStates(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp +index 0a15c9f7e..805748a1c 100644 +--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp ++++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp +@@ -74,13 +74,13 @@ void Quick3DTechnique::appendParameter(QQmlListProperty *list, QPara + technique->parentTechnique()->addParameter(param); + } + +-QParameter *Quick3DTechnique::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DTechnique::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTechnique *technique = qobject_cast(list->object); + return technique->parentTechnique()->parameters().at(index); + } + +-int Quick3DTechnique::parametersCount(QQmlListProperty *list) ++qsizetype Quick3DTechnique::parametersCount(QQmlListProperty *list) + { + Quick3DTechnique *technique = qobject_cast(list->object); + return technique->parentTechnique()->parameters().count(); +@@ -102,7 +102,7 @@ void Quick3DTechnique::appendRenderPass(QQmlListProperty *list, QRe + } + } + +-QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty *list, int index) ++QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTechnique *technique = qobject_cast(list->object); + if (technique) +@@ -110,7 +110,7 @@ QRenderPass *Quick3DTechnique::renderPassAt(QQmlListProperty *list, + return 0; + } + +-int Quick3DTechnique::renderPassCount(QQmlListProperty *list) ++qsizetype Quick3DTechnique::renderPassCount(QQmlListProperty *list) + { + Quick3DTechnique *technique = qobject_cast(list->object); + if (technique) +@@ -147,7 +147,7 @@ void Quick3DTechnique::appendFilterKey(QQmlListProperty *list, QFilt + } + } + +-QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty *list, int index) ++QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTechnique *technique = qobject_cast(list->object); + if (technique) +@@ -155,7 +155,7 @@ QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty *list, in + return 0; + } + +-int Quick3DTechnique::filterKeyCount(QQmlListProperty *list) ++qsizetype Quick3DTechnique::filterKeyCount(QQmlListProperty *list) + { + Quick3DTechnique *technique = qobject_cast(list->object); + if (technique) +diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h +index 0c02e07c3..425eb0b25 100644 +--- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h ++++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h +@@ -81,18 +81,18 @@ public: + private: + + static void appendParameter(QQmlListProperty *list, QParameter *param); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parametersCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parametersCount(QQmlListProperty *list); + static void clearParameterList(QQmlListProperty *list); + + static void appendFilterKey(QQmlListProperty *list, QFilterKey *filterKey); +- static QFilterKey *filterKeyAt(QQmlListProperty *list, int index); +- static int filterKeyCount(QQmlListProperty *list); ++ static QFilterKey *filterKeyAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype filterKeyCount(QQmlListProperty *list); + static void clearFilterKeyList(QQmlListProperty *list); + + static void appendRenderPass(QQmlListProperty *list, QRenderPass* renderPass); +- static QRenderPass *renderPassAt(QQmlListProperty *list, int index); +- static int renderPassCount(QQmlListProperty *list); ++ static QRenderPass *renderPassAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype renderPassCount(QQmlListProperty *list); + static void clearRenderPasses( QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +index 2019093c9..01e114fab 100644 +--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp ++++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +@@ -77,7 +77,7 @@ void Quick3DTechniqueFilter::appendRequire(QQmlListProperty *list, Q + } + } + +-QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty *list, int index) ++QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTechniqueFilter *filter = qobject_cast(list->object); + if (filter) +@@ -85,7 +85,7 @@ QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty *list + return 0; + } + +-int Quick3DTechniqueFilter::requiresCount(QQmlListProperty *list) ++qsizetype Quick3DTechniqueFilter::requiresCount(QQmlListProperty *list) + { + Quick3DTechniqueFilter *filter = qobject_cast(list->object); + if (filter) +@@ -109,13 +109,13 @@ void Quick3DTechniqueFilter::appendParameter(QQmlListProperty *list, + techniqueFilter->parentTechniqueFilter()->addParameter(param); + } + +-QParameter *Quick3DTechniqueFilter::parameterAt(QQmlListProperty *list, int index) ++QParameter *Quick3DTechniqueFilter::parameterAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTechniqueFilter *techniqueFilter = qobject_cast(list->object); + return techniqueFilter->parentTechniqueFilter()->parameters().at(index); + } + +-int Quick3DTechniqueFilter::parametersCount(QQmlListProperty *list) ++qsizetype Quick3DTechniqueFilter::parametersCount(QQmlListProperty *list) + { + Quick3DTechniqueFilter *techniqueFilter = qobject_cast(list->object); + return techniqueFilter->parentTechniqueFilter()->parameters().count(); +diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +index 9cd776827..9a2b396ac 100644 +--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h ++++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +@@ -80,13 +80,13 @@ public: + + private: + static void appendRequire(QQmlListProperty *list, QFilterKey *criterion); +- static QFilterKey *requireAt(QQmlListProperty *list, int index); +- static int requiresCount(QQmlListProperty *list); ++ static QFilterKey *requireAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype requiresCount(QQmlListProperty *list); + static void clearRequires(QQmlListProperty *list); + + static void appendParameter(QQmlListProperty *list, QParameter *param); +- static QParameter *parameterAt(QQmlListProperty *list, int index); +- static int parametersCount(QQmlListProperty *list); ++ static QParameter *parameterAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype parametersCount(QQmlListProperty *list); + static void clearParameterList(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp +index 7627a3283..01f36542d 100644 +--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp ++++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp +@@ -68,7 +68,7 @@ void Quick3DTextureExtension::appendTextureImage(QQmlListPropertyparentTexture()->addTextureImage(textureImage); + } + +-QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty *list, int index) ++QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty *list, qsizetype index) + { + Quick3DTextureExtension *self = qobject_cast(list->object); + if (self) +@@ -76,7 +76,7 @@ QAbstractTextureImage *Quick3DTextureExtension::textureImageAt(QQmlListProperty< + return nullptr; + } + +-int Quick3DTextureExtension::textureImageCount(QQmlListProperty *list) ++qsizetype Quick3DTextureExtension::textureImageCount(QQmlListProperty *list) + { + Quick3DTextureExtension *self = qobject_cast(list->object); + if (self) +diff --git a/src/quick3d/quick3drender/items/quick3dtexture_p.h b/src/quick3d/quick3drender/items/quick3dtexture_p.h +index 54d23a16b..2f22d404e 100644 +--- a/src/quick3d/quick3drender/items/quick3dtexture_p.h ++++ b/src/quick3d/quick3drender/items/quick3dtexture_p.h +@@ -77,8 +77,8 @@ public: + + private: + static void appendTextureImage(QQmlListProperty *list, QAbstractTextureImage *textureImage); +- static QAbstractTextureImage *textureImageAt(QQmlListProperty *list, int index); +- static int textureImageCount(QQmlListProperty *list); ++ static QAbstractTextureImage *textureImageAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype textureImageCount(QQmlListProperty *list); + static void clearTextureImageList(QQmlListProperty *list); + }; + +diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp +index 8a8577713..a1b8c96de 100644 +--- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp ++++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp +@@ -65,7 +65,7 @@ void QQuick3DScene2D::appendEntity(QQmlListProperty *list, + scene2d->parentScene2D()->addEntity(entity); + } + +-int QQuick3DScene2D::entityCount(QQmlListProperty *list) ++qsizetype QQuick3DScene2D::entityCount(QQmlListProperty *list) + { + QQuick3DScene2D *scene2d = qobject_cast(list->object); + if (scene2d) +@@ -73,7 +73,7 @@ int QQuick3DScene2D::entityCount(QQmlListProperty *list) + return 0; + } + +-Qt3DCore::QEntity *QQuick3DScene2D::entityAt(QQmlListProperty *list, int index) ++Qt3DCore::QEntity *QQuick3DScene2D::entityAt(QQmlListProperty *list, qsizetype index) + { + QQuick3DScene2D *scene2d = qobject_cast(list->object); + if (scene2d) { +diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h +index fe4dd157c..26887cd3a 100644 +--- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h ++++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d_p.h +@@ -78,8 +78,8 @@ public: + private: + + static void appendEntity(QQmlListProperty *list, Qt3DCore::QEntity *entity); +- static Qt3DCore::QEntity *entityAt(QQmlListProperty *list, int index); +- static int entityCount(QQmlListProperty *list); ++ static Qt3DCore::QEntity *entityAt(QQmlListProperty *list, qsizetype index); ++ static qsizetype entityCount(QQmlListProperty *list); + static void clearEntities(QQmlListProperty *list); + }; + diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index a4ef86f..1ef9ad2 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -15,6 +15,7 @@ include recipes-qt/qt6/qt6.inc SRC_URI += " \ git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \ + file://0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch \ " DEPENDS = "qtbase qtdeclarative qtshadertools-native" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index 3bf413b..34c3944 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv" -SRCREV = "73b059a5ae0200f171397d5c39f0f69bbce97fa1" +SRCREV = "a919ad565e95e0c3eda930fd7b4d727018ff585a" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 2fa35aa..eac6239 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -144,4 +144,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "3c3c5778e2a1c86a8492ae635844f5b8a553a571" +SRCREV = "d8efe51303a08e93240766c620d2a7be3df0dd04" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 073d150..fae87a2 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "bb61349080e34f154e8b2094f4765f42b2ae8c40" +SRCREV = "39065e1cecdeb3f13917d48ff6381ffd6bcfc52f" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 8c38816..802cbda 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = " \ " inherit qt6-cmake +inherit disable-build include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 4b37325..eb24ded 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \ " SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "d1305da14229716eace131f4a7e18c7da98f3e12" +SRCREV_qtquick3d = "877ab0a41a2472b59ea1cd3eddcc30c70e3027e1" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb index 03d3a94..6c0ed9b 100644 --- a/recipes-qt/qt6/qtquickcontrols2_git.bb +++ b/recipes-qt/qt6/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "5d73c595c54bcd63a9d77a0224f1209476ee5b93" +SRCREV = "e3a6e2b0cd9a56e28f881e3602e378c90ae8238b" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index 50d5e7f..adccf42 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "3b0b39792cf6630435b3218d88021f143f937b2a" +SRCREV = "5e4fa9054ed08c4dad01c1fd3d7ac83f1aea3c82" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index 26e0e25..2caa2c0 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "02f7757d497819bd927f55107c08535dac14ecb8" +SRCREV = "bd39a1c9744dffb234c37a60549d0e0da3d5171e" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index b7d55ac..651b5a3 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "3322c62f0129f6e87a184ba5f1956195c8a84a03" +SRCREV = "4539d62e1c5d6389da53c1c788518ea2b8c5f0dc" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index a8b596f..a5f779a 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "071b4615e264cf097414095828e6b8bea742c065" +SRCREV = "0cfb6d067b7dc7ccf5ad5247e9722ca8e7eff13a" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 312872a..9d65a23 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -18,4 +18,4 @@ python populate_packages_prepend () { 'Qt translations for %s', extra_depends='') } -SRCREV = "b1445afeba173a71bd07348e26e907494511b946" +SRCREV = "5922361002a96d59d9b38121ac3aa0b095528ad2" diff --git a/recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch b/recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch index 1fad631..a84e509 100644 --- a/recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch +++ b/recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch @@ -1,19 +1,19 @@ -From 942a41618d12f45e8803cfe995fdf3f9fb9fb081 Mon Sep 17 00:00:00 2001 +From 2a4f01d115ce9a69a71ac8c028e1c9cae9db63b3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 29 Jan 2020 12:39:09 +0200 Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4 --- - CMakeLists.txt | 7 +------ + CMakeLists.txt | 5 ----- src/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e72c5e1c..232450ed 100644 +index 642afabb..08365f2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,19 +18,14 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS +@@ -21,11 +21,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals ) @@ -24,16 +24,7 @@ index e72c5e1c..232450ed 100644 - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Core - Gui -- OpenGL ) - - find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS - Quick -+ OpenGL - ) - # special case end - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8e60f0ba..4b2639e3 100644 --- a/src/CMakeLists.txt diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index b5867cb..2589b37 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "f6be90fe629813d4941487b3a162778312e82dd0" +SRCREV = "cdf0dcb42096c865ca7ad25a3e7f1e6f71010f34"