diff options
| author | Pierre Rossi <pierre.rossi@nokia.com> | 2011-12-16 19:26:40 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 15:47:09 +0100 |
| commit | 10ac80708555cd0cca181e637d3a95c80826ec69 (patch) | |
| tree | 990cae7c98c4fa892266565688da50d343961616 /src/gui/text/qtextlayout.h | |
| parent | 6e483e8385a6f1ec4af6b16bb792b272f0389ff4 (diff) | |
Add support for QRawFont in QTextLayout.
The purpose of this change is to allow shaping complex
text while using QRawFont.
This is needed for WebKit so that we can switch to
using QRawFont everywhere and be more in line with
what other WebKit ports do.
Since this change slightly bends the aim of QRawFont,
let's reserve this for internal use for now.
Change-Id: I5ec0881f50ce288350bd277570cb5f1fb70c355c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/gui/text/qtextlayout.h')
| -rw-r--r-- | src/gui/text/qtextlayout.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index a3bc79dc52..2c38973371 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -59,6 +59,9 @@ QT_BEGIN_NAMESPACE class QTextEngine; class QFont; +#ifndef QT_NO_RAWFONT +class QRawFont; +#endif class QRect; class QRegion; class QTextFormat; @@ -114,6 +117,10 @@ public: void setFont(const QFont &f); QFont font() const; +#ifndef QT_NO_RAWFONT + void setRawFont(const QRawFont &rawFont); +#endif + void setText(const QString& string); QString text() const; |