summaryrefslogtreecommitdiffstats
path: root/tests/qmldynamicdata
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-12-11 13:12:18 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-12-11 13:15:15 +0200
commit6cfc1dcc2969e0e522aa5777eef97e0eadc967e7 (patch)
treec4f5c9799cc7903946b2756432b9ac987360ba66 /tests/qmldynamicdata
parent2a11c7f805ce1f980167af4971cde1eebe660c7a (diff)
Multiseries support for theme colors and gradients, part 2
Task-number: QTRD-2611 Change-Id: I280f3b7c22a212ed46813bd28c639d255107f9f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/qmldynamicdata')
-rw-r--r--tests/qmldynamicdata/qml/qmldynamicdata/main.qml17
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml
index e8e23b75..4ed3b8ae 100644
--- a/tests/qmldynamicdata/qml/qmldynamicdata/main.qml
+++ b/tests/qmldynamicdata/qml/qmldynamicdata/main.qml
@@ -58,6 +58,16 @@ Item {
}
}
+ ThemeColor {
+ id: dynamicColor
+ ColorAnimation on color {
+ from: "red"
+ to: "yellow"
+ duration: 5000
+ loops: Animation.Infinite
+ }
+ }
+
Item {
id: dataView
anchors.bottom: parent.bottom
@@ -68,7 +78,10 @@ Item {
id: scatterGraph
width: dataView.width
height: dataView.height
- theme: Theme3D { type: Theme3D.ThemeDigia }
+ theme: Theme3D {
+ type: Theme3D.ThemeQt
+ baseColors: [dynamicColor]
+ }
shadowQuality: AbstractGraph3D.ShadowQualitySoftMedium
scene.activeCamera.yRotation: 30.0
inputHandler: null
@@ -185,7 +198,7 @@ Item {
NewButton {
id: cameraToggle
width: parent.width / 3
- text: "Animate Camera"
+ text: "Pause Camera"
anchors.left: shadowToggle.right
onClicked: {