diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:54:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 09:56:20 +0200 |
| commit | 6b58ce5251045fb751eb511b2cb3571bcd113f28 (patch) | |
| tree | 7d3b63836c7ec0cce618ce4180c9f5ed63900a6a /src/quick/items/qquicktextinput.cpp | |
| parent | 93d7c26653757755ae65f14d06d6df6f9ec2fc07 (diff) | |
| parent | c849f3a7eff55d60c4010831ec67336c5c0f2a27 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicktext/BLACKLIST
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: I8bd68b0b5e853b7908791d2cbddd18dd527c76ae
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 168fd0d9b6..3d708c8eeb 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -2264,8 +2264,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 { |