summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfximage.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-28 06:30:37 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-28 06:30:37 (GMT)
commit190f15cd1cf163d0ed883828608d2175404d7e11 (patch)
tree17a02727e088ab8cd8225fc4fac39132df78552c /src/declarative/fx/qfximage.cpp
parent67eaebdf15471e47529a6496c0de1963fe7cd8ec (diff)
parentb7a30841120afb7be26fe980489db5757f1d2ef3 (diff)
downloadQt-190f15cd1cf163d0ed883828608d2175404d7e11.zip
Qt-190f15cd1cf163d0ed883828608d2175404d7e11.tar.gz
Qt-190f15cd1cf163d0ed883828608d2175404d7e11.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfximage.cpp')
-rw-r--r--src/declarative/fx/qfximage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp
index 860af66..45a481c 100644
--- a/src/declarative/fx/qfximage.cpp
+++ b/src/declarative/fx/qfximage.cpp
@@ -82,7 +82,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Image,QFxImage)
\o fillMode: Tile
\qml
Image {
- fillMode: "Tile"
+ fillMode: Image.Tile
width: 160; height: 160
source: "pics/qtlogo.png"
}
@@ -92,7 +92,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Image,QFxImage)
\o fillMode: TileVertically
\qml
Image {
- fillMode: "TileVertically"
+ fillMode: Image.TileVertically
width: 160; height: 160
source: "pics/qtlogo.png"
}
@@ -102,7 +102,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Image,QFxImage)
\o fillMode: TileHorizontally
\qml
Image {
- fillMode: "TileHorizontally"
+ fillMode: Image.TileHorizontally
width: 160; height: 160
source: "pics/qtlogo.png"
}
@@ -161,7 +161,7 @@ void QFxImage::setPixmap(const QPixmap &pix)
}
/*!
- \qmlproperty FillMode Image::fillMode
+ \qmlproperty enumeration Image::fillMode
Set this property to define what happens when the image set for the item is smaller
than the size of the item.