diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-18 10:33:28 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-18 10:33:34 +0200 |
commit | 8bb3378d0d7c82eb1896ac043570ddab7c2edae9 (patch) | |
tree | f3fe8bce8b4df108c1cc9766fdbafea95c3bd490 /examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml | |
parent | 78ab305d5ca59a158232a8b47070ef35ae803033 (diff) | |
parent | 186e8bf9ec08b1aca289a23b93290bf4cd5521fe (diff) |
Merge remote-tracking branch 'origin/2.0'
Change-Id: Ic20a847cd27c284a3a1b51f142bda94f619ae51e
Diffstat (limited to 'examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml')
-rw-r--r-- | examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml b/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml index ef7d0e7..c0757e2 100644 --- a/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml +++ b/examples/3dstudioruntime2/qmldatainput/qml/qmldatainput/main.qml @@ -83,14 +83,14 @@ Item { property: "inputScaleVec3" duration: 12000 from: Qt.vector3d(0.3, 0.5, 0.5) - to: Qt.vector3d(1.0, 1.0, 1.0) + to: Qt.vector3d(4.0, 4.0, 1.0) loops: Animation.Infinite running: true } Vector3dAnimation { target: studio3D property: "inputColorVec3" - duration: 2000 + duration: 6000 from: Qt.vector3d(0.1, 0.1, 0.3) to: Qt.vector3d(1.0, 0.5, 1.0) loops: Animation.Infinite |