diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-02 12:24:46 (GMT) |
| commit | 54796e0d3150df7dd94e715c095c21fb227139ee (patch) | |
| tree | 28fbc8e03ebe3ad836b7c6ca243213da269f60ac /src/gui/widgets | |
| parent | ad229913fd89aa0a33fb9b37ac96ff63c89a05f8 (diff) | |
| parent | 9ec7bbcb96149b1ce8a2d62b55c824d71ff292a8 (diff) | |
| download | Qt-54796e0d3150df7dd94e715c095c21fb227139ee.zip Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.gz Qt-54796e0d3150df7dd94e715c095c21fb227139ee.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 7f0c6c8..a32c257 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -538,7 +538,7 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl \internal Sets the selection to cover the word at the given cursor position. - The word boundries is defined by the behavior of QTextLayout::SkipWords + The word boundaries are defined by the behavior of QTextLayout::SkipWords cursor mode. */ void QLineControl::selectWordAtPos(int cursor) @@ -1213,7 +1213,7 @@ void QLineControl::internalRedo() /*! \internal - If the current cursor position differs from the last emited cursor + If the current cursor position differs from the last emitted cursor position, emits cursorPositionChanged(). */ void QLineControl::emitCursorPositionChanged() |