From 066814cc65a55fed6f18ee72515b5fb3dc4d7f4e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 5 Aug 2017 04:34:37 +0000 Subject: [PATCH] gui component all-in-one build fixes Signed-off-by: Ivailo Monev --- src/gui/kernel/qapplication_x11.cpp | 1 - src/gui/text/qfontengine_ft.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 4fa09c7f9..5dc814ecf 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -4631,7 +4631,6 @@ void QSmSocketReceiver::socketActivated(int) } -#undef Bool QT_BEGIN_INCLUDE_NAMESPACE #include "moc_qapplication_x11.cpp" #include "moc_qsessionmanager.h" diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index fada49e80..7cbec7783 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -109,7 +109,7 @@ QT_BEGIN_NAMESPACE #define TRUNC(x) ((x) >> 6) #define ROUND(x) (((x)+32) & -64) -static HB_Error hb_getSFntTable(void *font, HB_Tag tableTag, HB_Byte *buffer, HB_UInt *length) +static HB_Error hb_getSFntTableFt(void *font, HB_Tag tableTag, HB_Byte *buffer, HB_UInt *length) { #if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) > 20103 FT_Face face = (FT_Face)font; @@ -239,7 +239,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id, } newFreetype->face = face; - newFreetype->hbFace = qHBNewFace(face, hb_getSFntTable); + newFreetype->hbFace = qHBNewFace(face, hb_getSFntTableFt); Q_CHECK_PTR(newFreetype->hbFace); newFreetype->ref = 1; newFreetype->xsize = 0;