From 0409b7c33048461408112a06cd10b9a13f018cc6 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 15 Jun 2021 11:31:51 +0100 Subject: Fix build of manual tests Pick-to: 6.1 6.2 Change-Id: I4b8e1b3c5e2a8b942441a0889087330a7e1edff1 Reviewed-by: Paul Lemire --- tests/manual/rigged-simple/CMakeLists.txt | 4 ++-- tests/manual/rigged-simple/SkinnedEntity.qml | 4 ++-- tests/manual/skinned-mesh/CMakeLists.txt | 4 ++-- tests/manual/skinned-mesh/SkinnedEntity.qml | 4 ++-- tests/manual/skinned-mesh/main.qml | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/manual/rigged-simple/CMakeLists.txt b/tests/manual/rigged-simple/CMakeLists.txt index 6123e8112..9c51fc0c4 100644 --- a/tests/manual/rigged-simple/CMakeLists.txt +++ b/tests/manual/rigged-simple/CMakeLists.txt @@ -61,8 +61,8 @@ set_source_files_properties("../../../examples/qt3d/exampleresources/assets/envm PROPERTIES QT_RESOURCE_ALIAS "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) set(envmaps_resource_files - "assets/envmaps/cedar-bridge/cedar_bridge_irradiance.dds" - "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" + "../../../examples/qt3d/exampleresources/assets/envmaps/cedar-bridge/cedar_bridge_irradiance.dds" + "../../../examples/qt3d/exampleresources/assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) qt_internal_add_resource(rigged-simple "envmaps" diff --git a/tests/manual/rigged-simple/SkinnedEntity.qml b/tests/manual/rigged-simple/SkinnedEntity.qml index 9707673e0..4b3968e96 100644 --- a/tests/manual/rigged-simple/SkinnedEntity.qml +++ b/tests/manual/rigged-simple/SkinnedEntity.qml @@ -76,8 +76,8 @@ Entity { skeleton: SkeletonLoader { id: skeleton source: root.source - onStatusChanged: console.log("skeleton loader status: " + status) - onJointCountChanged: console.log("skeleton has " + jointCount + " joints") + onStatusChanged: console.log("skeleton loader status: " + skeleton.status) + onJointCountChanged: console.log("skeleton has " + skeleton.jointCount + " joints") } }, Material { diff --git a/tests/manual/skinned-mesh/CMakeLists.txt b/tests/manual/skinned-mesh/CMakeLists.txt index 70e147859..7720edb02 100644 --- a/tests/manual/skinned-mesh/CMakeLists.txt +++ b/tests/manual/skinned-mesh/CMakeLists.txt @@ -62,8 +62,8 @@ set_source_files_properties("../../../examples/qt3d/exampleresources/assets/envm PROPERTIES QT_RESOURCE_ALIAS "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) set(envmaps_resource_files - "assets/envmaps/cedar-bridge/cedar_bridge_irradiance.dds" - "assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" + "../../../examples/qt3d/exampleresources/assets/envmaps/cedar-bridge/cedar_bridge_irradiance.dds" + "../../../examples/qt3d/exampleresources/assets/envmaps/cedar-bridge/cedar_bridge_specular.dds" ) qt_internal_add_resource(skinned-mesh "envmaps" diff --git a/tests/manual/skinned-mesh/SkinnedEntity.qml b/tests/manual/skinned-mesh/SkinnedEntity.qml index f1c3ee0c2..b1e9c838e 100644 --- a/tests/manual/skinned-mesh/SkinnedEntity.qml +++ b/tests/manual/skinned-mesh/SkinnedEntity.qml @@ -26,8 +26,8 @@ Entity { skeleton: SkeletonLoader { id: skeleton source: root.source - onStatusChanged: console.log("skeleton loader status: " + status) - onJointCountChanged: console.log("skeleton has " + jointCount + " joints") + onStatusChanged: console.log("skeleton loader status: " + skeleton.status) + onJointCountChanged: console.log("skeleton has " + skeleton.jointCount + " joints") } }, Material { diff --git a/tests/manual/skinned-mesh/main.qml b/tests/manual/skinned-mesh/main.qml index 174d54f83..616ed3654 100644 --- a/tests/manual/skinned-mesh/main.qml +++ b/tests/manual/skinned-mesh/main.qml @@ -103,7 +103,7 @@ DefaultSceneEntity { ] } - onRunningChanged: console.log("running = " + running) + onRunningChanged: console.log("running = " + animator1.running) } ] } @@ -128,7 +128,7 @@ DefaultSceneEntity { ] } - onRunningChanged: console.log("running = " + running) + onRunningChanged: console.log("running = " + animator2.running) } ] } @@ -153,7 +153,7 @@ DefaultSceneEntity { ] } - onRunningChanged: console.log("running = " + running) + onRunningChanged: console.log("running = " + animator3.running) } ] } @@ -178,7 +178,7 @@ DefaultSceneEntity { ] } - onRunningChanged: console.log("running = " + running) + onRunningChanged: console.log("running = " + animator4.running) } ] } @@ -203,7 +203,7 @@ DefaultSceneEntity { ] } - onRunningChanged: console.log("running = " + running) +// onRunningChanged: console.log("running = " + running) } ] } -- cgit v1.2.3