diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-12 09:29:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-12 09:29:04 (GMT) |
| commit | 28ad5063e0fd3e268408a2483c06413a454a2a61 (patch) | |
| tree | 394d21f8da7d3f932ff1c42442f67542148179e2 /src/gui/text | |
| parent | 7f3d351002d4a138860651769309e20d2b593112 (diff) | |
| parent | 0113025720a1a07ac6a40b1f9c95746a904fdf4e (diff) | |
| download | Qt-28ad5063e0fd3e268408a2483c06413a454a2a61.zip Qt-28ad5063e0fd3e268408a2483c06413a454a2a61.tar.gz Qt-28ad5063e0fd3e268408a2483c06413a454a2a61.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Minor modifications and optimizations to the Symbian HW glyph cache.
Convert to new EGL API.
Don't invert glyphs for the default VG font cache on Symbian.
Move QVGFontGlyphCache from source file into a separate header
Ensure glyphs are upright instead of upside-down.
Enable cross-process glyph cache for OpenVG graphics system on Symbian.
Factor out RSgImage -> VGImage conversion to separate function.
Add new file for Symbian specific VG stuff and add Symbian glyph cache.
Move QVGFontGlyphCache from source file into a separate header
Make cacheGlyphs() function (and the destructor) virtual.
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index beeb4cc..d65f13b 100644 --- a/src/gui/text/qfontengine_s60_p.h +++ b/src/gui/text/qfontengine_s60_p.h @@ -54,7 +54,7 @@ // #include "qconfig.h" -#include "qfontengine_p.h" +#include <private/qfontengine_p.h> #include "qsize.h" #include <openfont.h> @@ -134,6 +134,7 @@ public: private: friend class QFontPrivate; + friend class QSymbianVGFontGlyphCache; QFixed glyphAdvance(HB_Glyph glyph) const; CFont *fontWithSize(qreal size) const; |