diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:01:21 +0200 |
| commit | c80eb38354854f2ccc7ea070a9857409acc36792 (patch) | |
| tree | 806cb68b337ac7c8ab8f9a48538e6e0211f57ed8 /src/quick/items/qquicktextedit.cpp | |
| parent | d38bac596946c3dd9cce3c0b4127509421dc917d (diff) | |
| parent | f19ec4561b4975d68290593b599d3c38d0f9f6d3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/qquicktableview.cpp
Done-With: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Done-With: Shawn Rutledge <shawn.rutledge@qt.io>
Change-Id: If9558a33f01693ce96420c094e0b57dfff0626cd
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 7414d7fd6a..c4e9c0d316 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1074,7 +1074,7 @@ int QQuickTextEdit::positionAt(qreal x, qreal y) const } /*! - \qmlmethod QtQuick::TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters) + \qmlmethod QtQuick::TextEdit::moveCursorSelection(int position, SelectionMode mode) Moves the cursor to \a position and updates the selection according to the optional \a mode parameter. (To only move the cursor, set the \l cursorPosition property.) @@ -1085,7 +1085,7 @@ int QQuickTextEdit::positionAt(qreal x, qreal y) const text range. The selection mode specifies whether the selection is updated on a per character or a per word - basis. If not specified the selection mode will default to TextEdit.SelectCharacters. + basis. If not specified the selection mode will default to \c {TextEdit.SelectCharacters}. \list \li TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at @@ -2828,7 +2828,7 @@ QString QQuickTextEdit::getFormattedText(int start, int end) const /*! \qmlmethod QtQuick::TextEdit::insert(int position, string text) - Inserts \a text into the TextEdit at position. + Inserts \a text into the TextEdit at \a position. */ void QQuickTextEdit::insert(int position, const QString &text) { |