diff options
| author | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-04-16 09:03:26 +0300 |
|---|---|---|
| committer | Kaj Grönholm <kaj.gronholm@qt.io> | 2019-04-16 08:56:57 +0000 |
| commit | 156910d1df8d3f11b72664cf0bf6b7fe800b53cf (patch) | |
| tree | 22e6c2c8c7f7c13ddda59b6b63fa7172661a0b55 | |
| parent | c902b71aab23a5263d181c9b6f2fc19ac8a6e7e6 (diff) | |
Fix q3dssurfaceviewer datainput autotests
Presentation was using older datainput notation without '$' in
property names. Now all q3dssurfaceviewer autotests are passing.
Task-number: QT3DS-3213
Change-Id: I4d360cf6a3eece028bf418f41920b43094244200
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| -rw-r--r-- | tests/auto/studio3d/shared/presentation/datainput.uip | 6 | ||||
| -rw-r--r-- | tests/auto/studio3d/shared/presentation/datainput_sub.uip | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/studio3d/shared/presentation/datainput.uip b/tests/auto/studio3d/shared/presentation/datainput.uip index 09110f23..3807cec2 100644 --- a/tests/auto/studio3d/shared/presentation/datainput.uip +++ b/tests/auto/studio3d/shared/presentation/datainput.uip @@ -5,7 +5,7 @@ <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> </ProjectSettings> <Graph > - <Scene id="Scene" backgroundcolor="0 1 0" controlledproperty="animationInput @timeline slideInput @slide" > + <Scene id="Scene" backgroundcolor="0 1 0" controlledproperty="$animationInput @timeline $slideInput @slide" > <Layer id="Layer" > <Camera id="Camera" /> <Light id="Light" /> @@ -37,7 +37,7 @@ <Add ref="#Default" diffusemap="#Default_diffusemap" /> <Add ref="#Default_diffusemap" sourcepath="maps/QT-symbol.png" subpresentation="subpres" /> <State id="Scene-Slide1" name="Slide1" initialplaystate="Pause" > - <Add ref="#Component" name="Component" controlledproperty="animationInput @timeline" /> + <Add ref="#Component" name="Component" controlledproperty="$animationInput @timeline" /> <Add ref="#Rectangle2" name="Rectangle2" position="0 0 100" scale="9999 9999 99999" sourcepath="#Rectangle" /> <Add ref="#Default_001" > <AnimationTrack property="diffuse.x" type="EaseInOut" >0 1 100 100 4.487 1 100 100 5.5 0 100 100 10 0 100 100</AnimationTrack> @@ -51,7 +51,7 @@ </State> <State name="Master Slide" component="#Component" > <State id="Component-Slide1" name="Slide1" initialplaystate="Pause" > - <Add ref="#Text" name="Text" controlledproperty="animationInput textstring" font="TitilliumWeb-Regular" position="-5.132 137.281 0" > + <Add ref="#Text" name="Text" controlledproperty="$animationInput textstring" font="TitilliumWeb-Regular" position="-5.132 137.281 0" > <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 10 0 100 100</AnimationTrack> <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 10 0 100 100</AnimationTrack> <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 10 -360 100 100</AnimationTrack> diff --git a/tests/auto/studio3d/shared/presentation/datainput_sub.uip b/tests/auto/studio3d/shared/presentation/datainput_sub.uip index 8909cbd3..c007eaba 100644 --- a/tests/auto/studio3d/shared/presentation/datainput_sub.uip +++ b/tests/auto/studio3d/shared/presentation/datainput_sub.uip @@ -5,11 +5,11 @@ <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> </ProjectSettings> <Graph > - <Scene id="Scene" controlledproperty="animationInput @timeline" > + <Scene id="Scene" controlledproperty="$animationInput @timeline" > <Layer id="Layer" > <Camera id="Camera" /> <Light id="Light" /> - <Text id="Text" controlledproperty="slideInput textstring" /> + <Text id="Text" controlledproperty="$slideInput textstring" /> </Layer> </Scene> </Graph> |