diff options
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/text.pri | 12 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 4 |
3 files changed, 2 insertions, 16 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 5abcadc2dc..8022e87379 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -361,7 +361,7 @@ inline QFontEngineFT::Glyph *QFontEngineFT::QGlyphSet::getGlyph(glyph_t index, Q return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition)); } -extern Q_GUI_EXPORT FT_Library qt_getFreetype(); +extern FT_Library qt_getFreetype(); QT_END_NAMESPACE diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index d0dd0ed129..4cf58fadcd 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -83,18 +83,6 @@ contains(QT_CONFIG, directwrite) { SOURCES += text/qfontenginedirectwrite.cpp } -unix:x11 { - HEADERS += \ - text/qfontengine_x11_p.h \ - text/qfontdatabase_x11.cpp \ - text/qfontengine_ft_p.h - SOURCES += \ - text/qfont_x11.cpp \ - text/qfontengine_x11.cpp \ - text/qfontengine_ft.cpp \ - text/qrawfont_ft.cpp -} - SOURCES += \ text/qfont_qpa.cpp \ text/qfontengine_qpa.cpp \ diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 3f9eddbcbf..f731b9443a 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -102,11 +102,9 @@ contains(QT_CONFIG, freetype) { QT_FREETYPE_DIR = $$QT_SOURCE_TREE/src/3rdparty/freetype HEADERS += \ - qwindowsfontdatabase_ft.h \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h + qwindowsfontdatabase_ft.h SOURCES += \ qwindowsfontdatabase_ft.cpp \ - $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp \ $$QT_FREETYPE_DIR/src/base/ftbase.c \ $$QT_FREETYPE_DIR/src/base/ftbbox.c \ $$QT_FREETYPE_DIR/src/base/ftdebug.c \ |