diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 13:02:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 13:02:05 (GMT) |
| commit | 7a1722cb33c238c288664a286b221a9cccfcfd2d (patch) | |
| tree | eddba253c16036b426211b34a32831bf60de8f51 /src/declarative/graphicsitems/qdeclarativeitem.cpp | |
| parent | e720c269b5f98da6c2b430df84cd86c3aede3d81 (diff) | |
| parent | 62db6c18c7f1f60819783ed5e1340e9fc09e072e (diff) | |
| download | Qt-7a1722cb33c238c288664a286b221a9cccfcfd2d.zip Qt-7a1722cb33c238c288664a286b221a9cccfcfd2d.tar.gz Qt-7a1722cb33c238c288664a286b221a9cccfcfd2d.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 exponential behavior of QTextCursor::removeSelectedText
Fix test for N900 (ARM-specific SVG results).
docs - fix doc links, minor improvements
Fix TextEdit bitmap tests testing the wrong element
Make autotests work with qreal == float (in addition to double).
Fix TextInput text getting improperly clipped
fix doc links
Fix docs to link to the new QML Viewer page instead of the Runtime page
qmlviewer: Update the proxy factory when the user changes the proxy.
Don't accept *files* that exist when *directory* is required.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 4abffc6..bd935c9 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2145,7 +2145,7 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const \property QDeclarativeItem::baselineOffset \brief The position of the item's baseline in local coordinates. - The baseline of a Text item is the imaginary line on which the text + The baseline of a \l Text item is the imaginary line on which the text sits. Controls containing text usually set their baseline to the baseline of their text. |