diff options
Diffstat (limited to 'tests/auto/animation/animationutils/tst_animationutils.cpp')
| -rw-r--r-- | tests/auto/animation/animationutils/tst_animationutils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp index 385398bd1..05558192d 100644 --- a/tests/auto/animation/animationutils/tst_animationutils.cpp +++ b/tests/auto/animation/animationutils/tst_animationutils.cpp @@ -38,7 +38,6 @@ #include <Qt3DAnimation/private/additiveclipblend_p.h> #include <Qt3DAnimation/private/lerpclipblend_p.h> #include <Qt3DAnimation/private/managers_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> #include <QtGui/qvector4d.h> @@ -57,7 +56,6 @@ Q_DECLARE_METATYPE(Clock *) Q_DECLARE_METATYPE(ChannelMapper *) Q_DECLARE_METATYPE(AnimationClip *) Q_DECLARE_METATYPE(QVector<MappingData>) -Q_DECLARE_METATYPE(QVector<Qt3DCore::QPropertyUpdatedChangePtr>) Q_DECLARE_METATYPE(Channel) Q_DECLARE_METATYPE(AnimatorEvaluationData) Q_DECLARE_METATYPE(ClipEvaluationData) @@ -1047,7 +1045,7 @@ private Q_SLOTS: mapping.type = static_cast<int>(QVariant::Vector3D); mapping.channelIndices = QVector<int>() << 0 << 1 << 2; mapping.callback = &callback; - mapping.callbackFlags = 0; + mapping.callbackFlags = {}; mappingData.push_back(mapping); channelResults = QVector<float>() << 1.0f << 2.0f << 3.0f; @@ -1073,7 +1071,7 @@ private Q_SLOTS: mapping.type = static_cast<int>(QVariant::Double); mapping.channelIndices = QVector<int>() << 0; mapping.callback = &callback; - mapping.callbackFlags = 0; + mapping.callbackFlags = {}; mappingData.push_back(mapping); channelResults = QVector<float>() << 1.0f; |