diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-11-14 10:17:35 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-11-20 11:59:42 +0000 |
commit | ba9827ab5de200756f5c2c0899fc01f1d573eae2 (patch) | |
tree | c591d5a38559ec1e2cf0435930c4b32a79c25e14 /src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp | |
parent | 9e2770d8995aedb07c517dd31395c8bb3a605def (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/quick3dmorphinganimation.cpp')
-rw-r--r-- | src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(QQmlListProperty<Qt3DAnimation animation->parentMorphingAnimation()->addMorphTarget(morphTarget); } -int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list) +qsizetype QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) @@ -72,7 +72,7 @@ int QQuick3DMorphingAnimation::morphTargetCount(QQmlListProperty<Qt3DAnimation:: } Qt3DAnimation::QMorphTarget *QQuick3DMorphingAnimation::morphTargetAt(QQmlListProperty<Qt3DAnimation::QMorphTarget> *list, - int index) + qsizetype index) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); if (animation) { |