diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
commit | 14821863b830b85ccb29df217a52f1ca52c9c421 (patch) | |
tree | 472e41f9c7e54cc6c9ea1fe1d63218d2960876ea /doc | |
parent | f2d9bdb36061b4b419e777075027f609bf9890b2 (diff) | |
parent | f7b6358f0d8ff9cad1fd1fcb9622fad40cb0f0b0 (diff) | |
download | Qt-14821863b830b85ccb29df217a52f1ca52c9c421.zip Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.gz Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/declarative/extending.qdoc | 1 | ||||
-rw-r--r-- | doc/src/snippets/declarative/border-image.qml | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index 7a4e51c..7a9de60 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -849,6 +849,7 @@ Item { \endcode \section1 Defining new Components +\target components A component is a reusable type with a well-defined interface built entirely in QML. Components appear as regular QML elements, and can be used interchangably diff --git a/doc/src/snippets/declarative/border-image.qml b/doc/src/snippets/declarative/border-image.qml new file mode 100644 index 0000000..c4215cd --- /dev/null +++ b/doc/src/snippets/declarative/border-image.qml @@ -0,0 +1,31 @@ +import Qt 4.6 + +Rectangle { + id: page + color: "white" + width: 520; height: 280 + + Row { + anchors.centerIn: parent + spacing: 50 +//! [0] + BorderImage { + width: 180; height: 180 + border.left: 30; border.top: 30 + border.right: 30; border.bottom: 30 + horizontalTileMode: BorderImage.Stretch + verticalTileMode: BorderImage.Stretch + source: "content/colors.png" + } + + BorderImage { + width: 180; height: 180 + border.left: 30; border.top: 30 + border.right: 30; border.bottom: 30 + horizontalTileMode: BorderImage.Round + verticalTileMode: BorderImage.Round + source: "content/colors.png" + } +//! [0] + } +} |