diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
| commit | bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0 (patch) | |
| tree | e3f0b23105b3ade96328314c6b59457068ebe8db /src/gui/text/qglyphs_p.h | |
| parent | a4d33d8c3cd206b982962014323abb673f5c64e3 (diff) | |
| parent | e004701bd7ba9e4a7cd5ac1bf784829feae16cae (diff) | |
| download | Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.zip Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.gz Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.bz2 | |
Merge remote branch 'fire/master'
Diffstat (limited to 'src/gui/text/qglyphs_p.h')
| -rw-r--r-- | src/gui/text/qglyphs_p.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/gui/text/qglyphs_p.h b/src/gui/text/qglyphs_p.h index c632e2f..944f777 100644 --- a/src/gui/text/qglyphs_p.h +++ b/src/gui/text/qglyphs_p.h @@ -53,8 +53,12 @@ // We mean it. // -#include <qfont.h> #include "qglyphs.h" +#include "qrawfont.h" + +#include <qfont.h> + +#if !defined(QT_NO_RAWFONT) QT_BEGIN_HEADER @@ -64,17 +68,30 @@ class QGlyphsPrivate: public QSharedData { public: QGlyphsPrivate() + : overline(false) + , underline(false) + , strikeOut(false) { } QGlyphsPrivate(const QGlyphsPrivate &other) - : QSharedData(other), glyphIndexes(other.glyphIndexes), glyphPositions(other.glyphPositions), font(other.font) + : QSharedData(other) + , glyphIndexes(other.glyphIndexes) + , glyphPositions(other.glyphPositions) + , font(other.font) + , overline(other.overline) + , underline(other.underline) + , strikeOut(other.strikeOut) { } QVector<quint32> glyphIndexes; QVector<QPointF> glyphPositions; - QFont font; + QRawFont font; + + uint overline : 1; + uint underline : 1; + uint strikeOut : 1; }; QT_END_NAMESPACE @@ -82,3 +99,5 @@ QT_END_NAMESPACE QT_END_HEADER #endif // QGLYPHS_P_H + +#endif // QT_NO_RAWFONT |