summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2020-11-14 10:17:35 +0000
committerMike Krus <mike.krus@kdab.com>2020-11-20 11:59:42 +0000
commitba9827ab5de200756f5c2c0899fc01f1d573eae2 (patch)
treec591d5a38559ec1e2cf0435930c4b32a79c25e14 /src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h
parent9e2770d8995aedb07c517dd31395c8bb3a605def (diff)
Follow up on change of QQmlListProperty to qsizetype
Also update dependencies and fix non-gui builds. Disabled (for now) gltf unit test since JSON parser seems to crash. Change-Id: Ie7fdd9626653e89ad43e8bdb22b0e764618b1e9e Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h')
-rw-r--r--src/quick3d/quick3danimation/items/quick3dvertexblendanimation_p.h7
1 files changed, 3 insertions, 4 deletions
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<Qt3DAnimation::QMorphTarget> *list,
Qt3DAnimation::QMorphTarget *morphTarget);
- static Qt3DAnimation::QMorphTarget *morphTargetAt(
- QQmlListProperty<Qt3DAnimation::QMorphTarget> *list,
- int index);
- static int morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list);
+ static Qt3DAnimation::QMorphTarget *morphTargetAt(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list,
+ qsizetype index);
+ static qsizetype morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list);
static void clearMorphTargets(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list);
};