diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-28 19:53:52 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-28 19:53:52 -0500 |
| commit | fd75bbccb94746d93ffc9f50e2cff7388c0dd390 (patch) | |
| tree | 9c365d41334f0dc83982b124ca12b8210fc52a05 /pkgs/development/libraries/qt-5 | |
| parent | 776c96272c5e812324f9d370276eac1b8c47441f (diff) | |
| download | nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar.gz nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar.bz2 nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar.lz nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar.xz nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.tar.zst nixpkgs-fd75bbccb94746d93ffc9f50e2cff7388c0dd390.zip | |
Revert "qt59-qtbase: fix darwin build with clang-5"
The fix is already included in Qt 5.9.7 This reverts commit 0bf153f9c08c7284f68808b9e9e475ed9469c8b3.
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, 0 insertions, 13 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 1c3a9b05cb2..875fba12e2f 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -1,16 +1,3 @@ -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 |