Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gui component all-in-one build fixes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2017-08-05 04:34:37 +00:00
parent 496870c614
commit 066814cc65
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/kernel/qapplication_x11.cpp
View file

@ -4631,7 +4631,6 @@ void QSmSocketReceiver::socketActivated(int)
}
#undef Bool
QT_BEGIN_INCLUDE_NAMESPACE
#include "moc_qapplication_x11.cpp"
#include "moc_qsessionmanager.h"

4
src/gui/text/qfontengine_ft.cpp
View file

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