summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-10-05 05:55:16 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-10-05 05:55:16 (GMT)
commit9c80d8284449e8cfc421aa047598020dc4c58772 (patch)
tree4a609d4f82bfbe033bd437384123f993fce7d8bf /examples/declarative
parenta3349d20dca10d32fc8ab95591108f1ec49dc034 (diff)
parentef9f35f4b3f29a0013f04d6245c7eefd92d5a560 (diff)
downloadQt-9c80d8284449e8cfc421aa047598020dc4c58772.zip
Qt-9c80d8284449e8cfc421aa047598020dc4c58772.tar.gz
Qt-9c80d8284449e8cfc421aa047598020dc4c58772.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/border-image/colors-round.sci10
-rw-r--r--examples/declarative/border-image/colors-stretch.sci10
2 files changed, 10 insertions, 10 deletions
diff --git a/examples/declarative/border-image/colors-round.sci b/examples/declarative/border-image/colors-round.sci
index 3784e10..506f6f5 100644
--- a/examples/declarative/border-image/colors-round.sci
+++ b/examples/declarative/border-image/colors-round.sci
@@ -1,7 +1,7 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
horizontalTileRule:Round
verticalTileRule:Round
-imageFile:colors.png
+source:colors.png
diff --git a/examples/declarative/border-image/colors-stretch.sci b/examples/declarative/border-image/colors-stretch.sci
index c693599..e4989a7 100644
--- a/examples/declarative/border-image/colors-stretch.sci
+++ b/examples/declarative/border-image/colors-stretch.sci
@@ -1,5 +1,5 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
-imageFile:colors.png
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+source:colors.png