diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-07 14:07:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 14:45:46 +0100 |
| commit | 3061730c2a3df6432f773c4eb481c5e6e35ec14a (patch) | |
| tree | c75b21495a093322c1ab0f5d0bba7f41009ab4ef /src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h | |
| parent | 28cf5ae000de36cd6ad0df942c2f99bfa7e22129 (diff) | |
| parent | fef6b31b994befac0ee14391572ebc2b9b33e104 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.mm
Change-Id: I11c5f8466c5b51e13e5ef6a8fc6e3f2dd79122a7
Diffstat (limited to 'src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h index c063f5df30..e98268ae4b 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h @@ -133,7 +133,7 @@ public: /* we don't cache glyphs that are too large anyway, so we can make this struct rather small */ struct Glyph { ~Glyph(); - short linearAdvance; + int linearAdvance : 22; unsigned char width; unsigned char height; short x; |