AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The QFontEngineFT files are not built into QtGui anymore.

Browse Source 
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 <jiang.jiang@nokia.com>
This commit is contained in:
Thiago Macieira 2012-05-30 12:24:30 +02:00 committed by Qt by Nokia
parent 9b07fd0d5c
commit 006edbd0d9
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qfontengine_ft_p.h
View File

@ -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

12
src/gui/text/text.pri
View File

@ -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 \

4
src/plugins/platforms/windows/windows.pro
View File

@ -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 \