diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-03-30 11:58:16 -0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-12 16:40:22 +0000 |
| commit | 35a36ad478f3bd1cddb9be2ae10f4676302f3460 (patch) | |
| tree | e78fdc8b0fbbb987d25b6c35758f8016cde9a4c3 /src | |
| parent | f2095f2c66d0dae8525879f6c14165ace650e7f1 (diff) | |
QCoreTextFontEngine: Fix build with Xcode 9.3
Apple LLVM version 9.1.0 (clang-902.0.39.1)
Error message:
.../qfontengine_coretext.mm:827:20: error: qualified reference to
'QFixed' is a constructor name rather than a type in this context
return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
(cherry-picked from commit dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index d96158d8f6..95826b0b72 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -838,7 +838,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl QFixed QCoreTextFontEngine::emSquareSize() const { - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); + return QFixed(int(CTFontGetUnitsPerEm(ctfont))); } QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const |