diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 12:27:54 +0200 |
| commit | 9d085bf0024c442b14b7d22bc629574058176deb (patch) | |
| tree | 98dc9c7703454906e66f022688bbc9a01f10ea5f /src/quick/items/qquicktextinput.cpp | |
| parent | 621c5b2b260d63fef7190c133f7384b8ccb93307 (diff) | |
| parent | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-beta1
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I0b9e5bea5da5d2666887c202e62d889b4aa56900
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 2ad3cd049f..dc4aecbbeb 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2340,8 +2340,8 @@ QString QQuickTextInput::preeditText() const If true, the user can use the mouse to select text in some platform-specific way. Note that for some platforms this may - not be an appropriate interaction (eg. may conflict with how - the text needs to behave inside a Flickable. + not be an appropriate interaction (it may conflict with how + the text needs to behave inside a \l Flickable, for example). */ bool QQuickTextInput::selectByMouse() const { |