diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-12 22:50:36 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-02-12 22:50:36 +0100 |
| commit | 0bf153f9c08c7284f68808b9e9e475ed9469c8b3 (patch) | |
| tree | 200c8d65f5bef214f4f91bb6883c17d6150d4bc3 /pkgs/development/libraries/qt-5 | |
| parent | a93b1ea8034e85cb1e3123df81843e8ce5b937fb (diff) | |
| download | nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar.gz nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar.bz2 nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar.lz nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar.xz nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.tar.zst nixpkgs-0bf153f9c08c7284f68808b9e9e475ed9469c8b3.zip | |
qt59-qtbase: fix darwin build with clang-5
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch index 875fba12e2f..1c3a9b05cb2 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -1,3 +1,16 @@ +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 66baf16..89794ef 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -830,7 +830,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 diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 341d3bc..3368234 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm |