summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-11-04 16:09:45 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-05 02:29:32 +0100
commitbdf2225b9bc32a6ac6013b6860f8613d349b765a (patch)
tree4b90b89de4f0690abeb290b6e33ae54c98a11a81 /src/gui/text
parent087fcc61824a54e49e68b9090b2983ef7dd18ddb (diff)
Restore subpixel rendering support with fontconfig and FreeType
Change-Id: I45cf83374ba5a8b1ae88415950c1e5ab72991598 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontengine_ft_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index bbef0bfcc7..6124eae91b 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -74,6 +74,7 @@
QT_BEGIN_NAMESPACE
class QFontEngineFTRawFont;
+class QFontconfigDatabase;
/*
* This struct represents one font file on disk (like Arial.ttf) and is shared between all the font engines
@@ -189,7 +190,6 @@ public:
QGlyphSet();
~QGlyphSet();
FT_Matrix transformationMatrix;
- unsigned long id; // server sided id, GlyphSet for X11
bool outline_drawing;
void removeGlyphFromCache(glyph_t index, QFixed subPixelPosition);
@@ -346,6 +346,7 @@ protected:
private:
friend class QFontEngineFTRawFont;
+ friend class QFontconfigDatabase;
int loadFlags(QGlyphSet *set, GlyphFormat format, int flags, bool &hsubpixel, int &vfactor) const;