diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-29 06:45:10 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-29 06:45:10 (GMT) |
| commit | 77bd318b2892ad2a6beefee84c8e1436f4f7f386 (patch) | |
| tree | 0de55e09200679501da73babed5cce1d4b558781 /src/gui/text | |
| parent | 7eba68adc4a7862d9474179592e5c8393a7acdbb (diff) | |
| parent | d22d08f3f8a70edfc66c0f6c2fd952688b64fcc2 (diff) | |
| download | Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.zip Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.gz Qt-77bd318b2892ad2a6beefee84c8e1436f4f7f386.tar.bz2 | |
Merge commit 'qt/master-stable'
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontmetrics.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp index 9f19fd9..2f3a791 100644 --- a/src/gui/text/qfontmetrics.cpp +++ b/src/gui/text/qfontmetrics.cpp @@ -557,11 +557,10 @@ int QFontMetrics::width(const QString &text, int len) const \warning This function will produce incorrect results for Arabic characters or non-spacing marks in the middle of a string, as the glyph shaping and positioning of marks that happens when - processing strings cannot be taken into account. Use charWidth() - instead if you aren't looking for the width of isolated - characters. + processing strings cannot be taken into account. When implementing + an interactive text control, use QTextLayout instead. - \sa boundingRect(), charWidth() + \sa boundingRect() */ int QFontMetrics::width(QChar ch) const { @@ -1386,9 +1385,8 @@ qreal QFontMetricsF::width(const QString &text) const \warning This function will produce incorrect results for Arabic characters or non-spacing marks in the middle of a string, as the glyph shaping and positioning of marks that happens when - processing strings cannot be taken into account. Use charWidth() - instead if you aren't looking for the width of isolated - characters. + processing strings cannot be taken into account. When implementing + an interactive text control, use QTextLayout instead. \sa boundingRect() */ |