diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:29:40 +0100 |
| commit | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (patch) | |
| tree | e28a2fadc82652798302cc7f79a6f4310a2eb8d7 /src/3rdparty/freetype/src/sfnt/pngshim.c | |
| parent | 14bb413309092adc53e8451daff5690c4698c07d (diff) | |
| parent | c15a069830baf87f57c84e86326cf86ba9a39713 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/gui/rhi/qshader.cpp
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
Change-Id: I1c4ae718eb3592a0a0a90af9d11553f3ab68cad5
Diffstat (limited to 'src/3rdparty/freetype/src/sfnt/pngshim.c')
| -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__ |