From 006edbd0d948e96713c2f983d2cedfa0c1798f61 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 30 May 2012 12:24:30 +0200 Subject: [PATCH] The QFontEngineFT files are not built into QtGui anymore. These files are only built into QtPlatformSupport, so the Q_GUI_EXPORT macro is now wrong. Remove it. Additionally, since these files are built into QtPlatformSupport, the windows platform plugin does not need to build them again. To-Do: move the files to src/platformsupport/fontdatabases Change-Id: I9d69b97ca25ee52ab627cfa633f43b277acc5e05 Reviewed-by: Jiang Jiang --- src/gui/text/qfontengine_ft_p.h | 2 +- src/gui/text/text.pri | 12 ------------ 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 5abcadc..8022e87 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 d0dd0ed..4cf58fa 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 3f9eddb..f731b94 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 \ -- 2.7.4