diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:19:54 +0100 |
| commit | 4fabebb332d8409b76e88edc74905f99119f0da4 (patch) | |
| tree | 7dff5241738b7ad5f46bdbbc0c01c2955ee1d5c1 /src/quick/items/qquicktextinput.cpp | |
| parent | 561b9323c22a594b402eac343690898d4e9c44d0 (diff) | |
| parent | 131fe1b85311b8ab02498cea5d1dda2188dcdabc (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/quick/util/qquickimageprovider.cpp
Change-Id: I7ca4e49468b5ba697208287be4684e42b9900023
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index ab8e75bfef..087b8b8135 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -1207,7 +1207,7 @@ void QQuickTextInput::setInputMethodHints(Qt::InputMethodHints hints) If you set a cursorDelegate for a TextInput, this delegate will be used for drawing the cursor instead of the standard cursor. An instance of the delegate will be created and managed by the TextInput when a cursor is - needed, and the x property of delegate instance will be set so as + needed, and the x property of the delegate instance will be set so as to be one pixel before the top left of the current character. Note that the root item of the delegate component must be a QQuickItem or |