path: root/src
diff options
authorPekka Vuorela <>2012-02-28 17:41:40 +0200
committerQt by Nokia <>2012-04-02 12:04:55 +0200
commit89e3506e5b36328f728cee4951df8459e4778b00 (patch)
tree97839790b70416d09a21d57d5028d0d3d9f2d193 /src
parent2340c5d92e89eb241d3a3ac79682c7df48d57a0e (diff)
Document preedit details on QTextLayout
Change-Id: Ic73f6d2c748b2ac02b1a8b8c0b00721793557cfd Reviewed-by: Eskil Abrahamsen Blomfeldt <>
Diffstat (limited to 'src')
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 56098b0bdb..ac91ed00cf 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -506,6 +506,7 @@ QString QTextLayout::preeditAreaText() const
Sets the additional formats supported by the text layout to \a formatList.
+ The formats are applied with preedit area text in place.
\sa additionalFormats(), clearAdditionalFormats()
@@ -2703,6 +2704,7 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
Converts the x-coordinate \a x, to the nearest matching cursor
position, depending on the cursor position type, \a cpos.
+ Note that result cursor position includes possible preedit area text.
\sa cursorToX()