diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 18:56:03 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 18:56:03 +1000 |
| commit | 8485052e3991aebf7c823b3e80fc06ccf9f08991 (patch) | |
| tree | dcb2db231d640bc9327fe625353fa1e43fcb572d /src/gui/text/qtextobject.cpp | |
| parent | 685df07ff7e357f6848c50cffa311641afdca307 (diff) | |
| parent | 6c121991f85164d257208b14845c7ff913a687f4 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Make sure #ifdef'd tests still have main() function
Long live QRawFont!
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 9139561f53..5c1c8b9edc 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -1666,6 +1666,7 @@ QTextBlock::iterator &QTextBlock::iterator::operator--() \sa QGlyphs, QTextBlock::layout(), QTextLayout::position(), QPainter::drawGlyphs() */ +#if !defined(QT_NO_RAWFONT) QList<QGlyphs> QTextFragment::glyphs() const { if (!p || !n) @@ -1689,6 +1690,7 @@ QList<QGlyphs> QTextFragment::glyphs() const return ret; } +#endif // QT_NO_RAWFONT /*! Returns the position of this text fragment in the document. |