diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-14 09:52:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-14 09:52:51 +0100 |
| commit | 9a14171a10c8f92c30a50b9e89aa50a06dbfeeb3 (patch) | |
| tree | 3178125154cd1013379231e7b4c6d8395e891a03 /src/3rdparty | |
| parent | 51cbd5288c85cb4de382cb23d6f5559c2b626126 (diff) | |
| parent | 30f4ca4e4fbc1d8cf86808dbeb00ec3c046f6c1c (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I28ba24ae126a054c1aec17fa19ad594718f870c5
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/freetype/src/sfnt/pngshim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/src/sfnt/pngshim.c b/src/3rdparty/freetype/src/sfnt/pngshim.c index ca85d9751f..fc78b6d5df 100644 --- a/src/3rdparty/freetype/src/sfnt/pngshim.c +++ b/src/3rdparty/freetype/src/sfnt/pngshim.c @@ -68,6 +68,7 @@ ( ( __clang_major__ >= 4 ) || \ ( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \ defined( __OPTIMIZE__ ) && \ + !defined( __EMSCRIPTEN__ ) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #ifdef __clang__ |