diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-27 14:21:54 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-28 11:01:04 +0200 |
commit | 07fa0ccfc458c217ba1c071784e980f65f404f84 (patch) | |
tree | 448f84635e988aeca08fe66b597688c183b898ac /src/gui/text/text.pri | |
parent | 9e57cd5e6a1793994fc538f410cce0fc64de95c3 (diff) |
Make QtQuick2 compile on QPA
Moved the logic to set pixel size into the font engines to avoid
making the platform plugin interface too complex, and added a function
in QPA to make an isolated font engine based on font data. Currently
none of the QPA back-ends supports it, but it compiles and spits out
a warning if you try to create a QRawFont from data there. This isn't
used in QtQuick2 anyway.
Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/gui/text/text.pri')
-rw-r--r-- | src/gui/text/text.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index df9398ce59..2e0c6dea5d 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -136,7 +136,8 @@ qpa { SOURCES += \ text/qfont_qpa.cpp \ text/qfontengine_qpa.cpp \ - text/qplatformfontdatabase_qpa.cpp + text/qplatformfontdatabase_qpa.cpp \ + text/qrawfont_qpa.cpp HEADERS += \ text/qplatformfontdatabase_qpa.h |