Du kan inte välja fler än 25 ämnen Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa.

qfixed-coretext.patch 1.4KB

12345678910111213141516171819202122232425262728293031323334
  1. From dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 Mon Sep 17 00:00:00 2001
  2. From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
  3. Date: Fri, 30 Mar 2018 11:58:16 -0700
  4. Subject: [PATCH] QCoreTextFontEngine: Fix build with Xcode 9.3
  5. Apple LLVM version 9.1.0 (clang-902.0.39.1)
  6. Error message:
  7. .../qfontengine_coretext.mm:827:20: error: qualified reference to
  8. 'QFixed' is a constructor name rather than a type in this context
  9. return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
  10. Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043
  11. Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
  12. ---
  13. src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
  16. index 25ff69d877d..98b753eff96 100644
  17. --- old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
  18. +++ new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
  19. @@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
  20. QFixed QCoreTextFontEngine::emSquareSize() const
  21. {
  22. - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
  23. + return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
  24. }
  25. QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
  26. --
  27. 2.16.3