diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 10:06:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 10:06:42 (GMT) |
| commit | a842b7e0a937a934e8af7b1edad324db8425ba8f (patch) | |
| tree | b65fe71996ca9bc320854d6dc405993810a55f0a /src/gui/text/qfontmetrics.h | |
| parent | 532861d77b661f332e5a16c031926da38a813ec5 (diff) | |
| parent | 70ba57c4716749c99e302a4eda4695942d0b45fe (diff) | |
| download | Qt-a842b7e0a937a934e8af7b1edad324db8425ba8f.zip Qt-a842b7e0a937a934e8af7b1edad324db8425ba8f.tar.gz Qt-a842b7e0a937a934e8af7b1edad324db8425ba8f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added DITA XML generator
Fix build failure on Symbian 3.1.
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
qdoc: Added DITA XML generator
doc: Fixed confusing ownership issue.
update Russian translations for Qt tools
update Russian translation for Qt libraries
QXmlSchema documentation correction
doc: Changed last breadcrumb to not be a link.
doc: Fixed reference to setSize(), which is in QRectF.
QNetworkCookie: do not accept cookies with non-alNum domain
QtDeclarative: Remove trailing commas in enums
Doc: MonotonicClock is obviously monotonic
Diffstat (limited to 'src/gui/text/qfontmetrics.h')
| -rw-r--r-- | src/gui/text/qfontmetrics.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index dca4b93..2518b54 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -89,6 +89,7 @@ public: int leftBearing(QChar) const; int rightBearing(QChar) const; int width(const QString &, int len = -1) const; + int width(const QString &, int len, int flags) const; int width(QChar) const; int charWidth(const QString &str, int pos) const; |