diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 10:44:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-16 10:44:09 (GMT) |
| commit | 636698a5f97401a9aeb18cd690d7f08b05dcd5e6 (patch) | |
| tree | 65050b764e1aeb3f002cd929ce443cb26ff98a2a /src/declarative/graphicsitems | |
| parent | 8d8566d061e26f18e1bde1255fdc1375035c8eaa (diff) | |
| parent | 975b1913e44128a3e9b9055f9bf2ff40d86adf2a (diff) | |
| download | Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.zip Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.gz Qt-636698a5f97401a9aeb18cd690d7f08b05dcd5e6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix RightBearing confusion in text layout
fixes, improvements for various docs and example code
Fixed debugger's evaluation of dynamic properties in context
Allow test to pass on smaller screens (eg. 480 high).
Minor animation doc improvement
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeborderimage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 44c206b..4881248 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -149,6 +149,8 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage() \endqml The URL may be absolute, or relative to the URL of the component. + + \sa QDeclarativeImageProvider */ void QDeclarativeBorderImage::setSource(const QUrl &url) { |