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 /src/declarative/graphicsitems/qmlgraphicsborderimage.cpp | |
| 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 'src/declarative/graphicsitems/qmlgraphicsborderimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsborderimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp index 634215e..04e79f9 100644 --- a/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsborderimage.cpp @@ -55,7 +55,7 @@ QML_DEFINE_TYPE(Qt,4,6,BorderImage,QmlGraphicsBorderImage) \brief The BorderImage element provides an image that can be used as a border. \inherits Item - \snippet examples/declarative/border-image/example.qml 0 + \snippet snippets/declarative/border-image.qml 0 \image BorderImage.png |