diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 01:00:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-19 01:00:08 +0100 |
| commit | 67c70b22f6376d3c8fbffaed73481d4e0675cb43 (patch) | |
| tree | e3c40849413beb3c112de0fc380bc2aaa0a04ea8 /src/3rdparty | |
| parent | 5242126a610ebe76513cee22ecd8b5354bbf96b7 (diff) | |
| parent | 6273b484b35479eb5788425c8d90acacdf239623 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ifa143cc462301aaa305c9c85360e543553a751f0
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__ |