summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@qt.io>2022-03-03 12:49:40 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-16 09:19:19 +0000
commit08e04f92dbc0af3e05ee5117f1507d30781f4427 (patch)
tree4835d9bb1f860daa97228903cc0afdbdfd509f5d
parent7db9da339cb39d2d0598379d328913ae918d4989 (diff)
Fix compilation for wasm
libjpeg's internal putenv() function uses system setenv(), but that is not found when building for webassembly. Just disable the entire putenv function, since it is not used anyway. Change-Id: I1eb60f31562ef4e33c656ff3b3752bef6f88fcb8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 31d401dec6abccab4e780a323b8536025b7bbf1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/3rdparty/libjpeg/src/jconfig.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/libjpeg/src/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h
index 0aaa3df8e5..7982724a26 100644
--- a/src/3rdparty/libjpeg/src/jconfig.h
+++ b/src/3rdparty/libjpeg/src/jconfig.h
@@ -13,3 +13,5 @@
#define MEM_SRCDST_SUPPORTED 1
#define BITS_IN_JSAMPLE 8
+
+#define NO_PUTENV