diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-07-27 12:19:55 (GMT) |
| commit | 4b696ce11ffed279ed92c63bb85cbcdaab818033 (patch) | |
| tree | 1c803fe730b7e90679b253bbf599e5ec092059c6 /doc/src | |
| parent | ed00fff3cb3f3f1ec01f5d69168222c3ce8d51b2 (diff) | |
| parent | 29031b406f0266b0b47ef7e8113ec861a90f201e (diff) | |
| download | Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.zip Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.gz Qt-4b696ce11ffed279ed92c63bb85cbcdaab818033.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/i18n.qdoc | 12 | ||||
| -rw-r--r-- | doc/src/paintsystem.qdoc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/i18n.qdoc b/doc/src/i18n.qdoc index 5964926..d043f45 100644 --- a/doc/src/i18n.qdoc +++ b/doc/src/i18n.qdoc @@ -144,13 +144,13 @@ aligned, so for these languages use the version of drawText() that takes a QRect since this will align in accordance with the language. - \o When you write your own text input controls, use \l - QFontMetrics::charWidth() to determine the width of a character in a - string. In some languages (e.g. Arabic or languages from the Indian + \o When you write your own text input controls, use QTextLayout. + In some languages (e.g. Arabic or languages from the Indian subcontinent), the width and shape of a glyph changes depending on the - surrounding characters. Writing input controls usually requires a - certain knowledge of the scripts it is going to be used in. Usually - the easiest way is to subclass QLineEdit or QTextEdit. + surrounding characters, which QTextLayout takes into account. + Writing input controls usually requires a certain knowledge of the + scripts it is going to be used in. Usually the easiest way is to + subclass QLineEdit or QTextEdit. \endlist diff --git a/doc/src/paintsystem.qdoc b/doc/src/paintsystem.qdoc index a75908b..c2434e0 100644 --- a/doc/src/paintsystem.qdoc +++ b/doc/src/paintsystem.qdoc @@ -121,7 +121,7 @@ Normally, QPainter draws in a "natural" coordinate system, but it is able to perform view and world transformations using the - QMatrix class. For more information, see \l {The Coordinate + QTransform class. For more information, see \l {The Coordinate System} documentation which also describes the rendering process, i.e. the relation between the logical representation and the rendered pixels, and the benefits of anti-aliased painting. |