summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-27 23:31:27 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-27 23:31:27 (GMT)
commitad269e8e6f85a99c48180f6b9e9b51891accfc45 (patch)
tree6ea7bfa8725707c0e7f9b330ef2e6aae3cb97c58 /examples
parentfb2e33b21557412ae7bde009662ca89870407f5f (diff)
parent0a13be045b7e7fdf2b4d1a44b7aba72711375787 (diff)
downloadQt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.zip
Qt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.tar.gz
Qt-ad269e8e6f85a99c48180f6b9e9b51891accfc45.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/dial/dial.qml11
-rw-r--r--examples/declarative/xmldata/yahoonews.qml6
2 files changed, 13 insertions, 4 deletions
diff --git a/examples/declarative/dial/dial.qml b/examples/declarative/dial/dial.qml
index 5e09171..b183798 100644
--- a/examples/declarative/dial/dial.qml
+++ b/examples/declarative/dial/dial.qml
@@ -9,12 +9,19 @@ Rect {
Rect {
anchors.top: Dial.bottom
x: 20; width: 160; height: 16
- color: "steelblue"; gradientColor: "lightsteelblue"
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: "steelblue" }
+ GradientStop { position: 1.0; color: "lightsteelblue" }
+ }
radius: 8; opacity: 0.7
Rect {
id: Slider
x: 2; y: 2; width: 30; height: 12
- color: "lightgray"; gradientColor: "gray"; radius: 6
+ radius: 6
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: "lightgray" }
+ GradientStop { position: 1.0; color: "gray" }
+ }
MouseRegion {
anchors.fill: parent
drag.target: parent; drag.axis: "x"; drag.xmin: 2; drag.xmax: 128
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index a465cdd..206c85f 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -1,6 +1,8 @@
Rect {
- color: "black"
- gradientColor: "#AAAAAA"
+ gradient: Gradient {
+ GradientStop { position: 0; color: "black" }
+ GradientStop { position: 1.0; color: "#AAAAAA" }
+ }
width: 600
height: 600
resources: [