diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-13 13:56:09 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 13:56:09 +0200 |
commit | 829675b65b8a9d661828b18bbd2703744d4c3db7 (patch) | |
tree | 9ed2b9fd867e34ef534f79f10e3493a17bd24b76 /tests/auto/animation/animationutils/tst_animationutils.cpp | |
parent | e9642824244fa9fe55dca2cef8e002192a4f1b17 (diff) | |
parent | 2b0f52bd4c2c9035d5ca1672e4ce4229490eb655 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp
Change-Id: I27de9b83fa6ef6bb319e4b11c932f91f9ff92dc3
Diffstat (limited to 'tests/auto/animation/animationutils/tst_animationutils.cpp')
-rw-r--r-- | tests/auto/animation/animationutils/tst_animationutils.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tests/auto/animation/animationutils/tst_animationutils.cpp b/tests/auto/animation/animationutils/tst_animationutils.cpp index 7a7abb1b3..36f1cbe2f 100644 --- a/tests/auto/animation/animationutils/tst_animationutils.cpp +++ b/tests/auto/animation/animationutils/tst_animationutils.cpp @@ -145,7 +145,6 @@ public: ChannelMapping *createChannelMapping(Handler *handler, const QString &channelName, const Qt3DCore::QNodeId targetId, - const QString &property, const char *propertyName, int type, int componentCount) @@ -155,7 +154,6 @@ public: setPeerId(channelMapping, channelMappingId); channelMapping->setHandler(handler); channelMapping->setTargetId(targetId); - channelMapping->setProperty(property); channelMapping->setPropertyName(propertyName); channelMapping->setChannelName(channelName); channelMapping->setType(type); @@ -292,7 +290,6 @@ private Q_SLOTS: auto channelMapping = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); @@ -376,7 +373,6 @@ private Q_SLOTS: auto locationMapping = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); @@ -384,7 +380,6 @@ private Q_SLOTS: auto metalnessMapping = createChannelMapping(handler, QLatin1String("Metalness"), Qt3DCore::QNodeId::createId(), - QLatin1String("metalness"), "metalness", static_cast<int>(QVariant::Double), 1); @@ -392,7 +387,6 @@ private Q_SLOTS: auto baseColorMapping = createChannelMapping(handler, QLatin1String("BaseColor"), Qt3DCore::QNodeId::createId(), - QLatin1String("baseColor"), "baseColor", static_cast<int>(QVariant::Vector3D), 3); @@ -400,7 +394,6 @@ private Q_SLOTS: auto roughnessMapping = createChannelMapping(handler, QLatin1String("Roughness"), Qt3DCore::QNodeId::createId(), - QLatin1String("roughness"), "roughness", static_cast<int>(QVariant::Double), 1); @@ -408,7 +401,6 @@ private Q_SLOTS: auto rotationMapping = createChannelMapping(handler, QLatin1String("Rotation"), Qt3DCore::QNodeId::createId(), - QLatin1String("rotation"), "rotation", static_cast<int>(QVariant::Quaternion), 4); @@ -416,7 +408,6 @@ private Q_SLOTS: auto morphTargetMapping = createChannelMapping(handler, QLatin1String("MorphTargetWeights"), Qt3DCore::QNodeId::createId(), - QLatin1String("weights"), "weights", static_cast<int>(QVariant::List), 5); @@ -2558,7 +2549,6 @@ private Q_SLOTS: auto channelMapping = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); @@ -2582,14 +2572,12 @@ private Q_SLOTS: auto channelMapping1 = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); auto channelMapping2 = createChannelMapping(handler, QLatin1String("Rotation"), Qt3DCore::QNodeId::createId(), - QLatin1String("rotatrion"), "rotation", static_cast<int>(QVariant::Quaternion), 4); @@ -2621,28 +2609,24 @@ private Q_SLOTS: auto channelMapping1 = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); auto channelMapping2 = createChannelMapping(handler, QLatin1String("Rotation"), Qt3DCore::QNodeId::createId(), - QLatin1String("rotation"), "rotation", static_cast<int>(QVariant::Quaternion), 4); auto channelMapping3 = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); auto channelMapping4 = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); @@ -3124,7 +3108,6 @@ private Q_SLOTS: auto channelMapping = createChannelMapping(handler, QLatin1String("Location"), Qt3DCore::QNodeId::createId(), - QLatin1String("translation"), "translation", static_cast<int>(QVariant::Vector3D), 3); @@ -3141,7 +3124,6 @@ private Q_SLOTS: auto channelMapping = createChannelMapping(handler, QLatin1String("Rotation"), Qt3DCore::QNodeId::createId(), - QLatin1String("rotation"), "rotation", static_cast<int>(QVariant::Quaternion), 4); @@ -3158,7 +3140,6 @@ private Q_SLOTS: auto channelMapping = createChannelMapping(handler, QLatin1String("Scale"), Qt3DCore::QNodeId::createId(), - QLatin1String("scale"), "scale", static_cast<int>(QVariant::Vector3D), 3); |