diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:13:54 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-12 12:13:54 (GMT) |
| commit | d758080a6c345abec5e06a36ed26a2757a53c65f (patch) | |
| tree | 8cb37f0d10ce187bb2e30b91adbb117c3671b672 /doc | |
| parent | 79f58df5b28dca88a4359ea9a76325e1a4a7f4e5 (diff) | |
| parent | f2b93868f48a3e2d6e462ca8a051ab47eefef49d (diff) | |
| download | Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.zip Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.tar.gz Qt-d758080a6c345abec5e06a36ed26a2757a53c65f.tar.bz2 | |
Merge commit 'qt/master' into kinetic-declarativeui
Conflicts:
doc/src/qnamespace.qdoc
src/gui/painting/qdrawutil.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/qnamespace.qdoc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc index b66ebee..7772958 100644 --- a/doc/src/qnamespace.qdoc +++ b/doc/src/qnamespace.qdoc @@ -2674,11 +2674,14 @@ \enum Qt::TileRule \since 4.6 - This enum describes how to repeat or stretch the parts of an image when drawing. + This enum describes how to repeat or stretch the parts of an image + when drawing. \value Stretch Scale the image to fit to the available area. - \value Repeat Tile the image until there is no more space. May crop the last image. - \value Round Like Repeat, but scales the images down to ensure that the last image is not cropped. - \sa qDrawBorderPixmap() + \value Repeat Tile the image until there is no more space. May crop + the last image. + + \value Round Like Repeat, but scales the images down to ensure that + the last image is not cropped. */ |