Make QtQuick2 compile on QPA
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Wed, 27 Apr 2011 12:21:54 +0000 (14:21 +0200)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Thu, 28 Apr 2011 09:01:04 +0000 (11:01 +0200)
commit07fa0ccfc458c217ba1c071784e980f65f404f84
tree448f84635e988aeca08fe66b597688c183b898ac
parent9e57cd5e6a1793994fc538f410cce0fc64de95c3
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
21 files changed:
src/corelib/global/qglobal.h
src/gui/text/qfontengine_coretext.mm
src/gui/text/qfontengine_coretext_p.h
src/gui/text/qfontengine_ft.cpp
src/gui/text/qfontengine_ft_p.h
src/gui/text/qfontengine_p.h
src/gui/text/qfontengine_win.cpp
src/gui/text/qfontengine_win_p.h
src/gui/text/qfontengine_x11.cpp
src/gui/text/qfontengine_x11_p.h
src/gui/text/qfontenginedirectwrite.cpp
src/gui/text/qfontenginedirectwrite_p.h
src/gui/text/qplatformfontdatabase_qpa.cpp
src/gui/text/qplatformfontdatabase_qpa.h
src/gui/text/qrawfont.cpp
src/gui/text/qrawfont_ft.cpp
src/gui/text/qrawfont_mac.cpp
src/gui/text/qrawfont_p.h
src/gui/text/qrawfont_qpa.cpp [new file with mode: 0644]
src/gui/text/qrawfont_win.cpp
src/gui/text/text.pri