diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-02-20 12:37:31 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-02-20 12:37:31 +0200 |
| commit | 33707f5b2fa45eea6c1163d98cf9d23015bacf02 (patch) | |
| tree | 6e24046e64432bccf11d00177f425de1f4d2c9c7 /src/3rdparty | |
| parent | 655e8623afed01de63ce43f55227fb019e800fe9 (diff) | |
| parent | 2fc4635e9889ade1ae79b787cc18aae654e65e3b (diff) | |
Merge 5.12 into 5.12.2
Change-Id: I3a5721aebd3afd8fa08d3f3df6bf61502fa9c347
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 16020266af..cd110776c8 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__ |