diff options
| author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-12-29 17:54:29 +0100 |
|---|---|---|
| committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2023-06-20 09:08:03 +0200 |
| commit | 1f6cac0da9c31b67f5cb5850ce52a4622e57b4d5 (patch) | |
| tree | c053e1b0e4d39c2436c150eb4208ecab6023bad3 /mkspecs | |
| parent | db9e206deecab7b78dd2177d4bcaf6415fb84c94 (diff) | |
Make WASM export names different across modules
The export name is now ${TARGET_NAME}Entry. This can also be overridden
by using QT_WASM_EXPORT_NAME, both in CMake and qmake
Change-Id: I59c97ae6e22f0b2720716e9d7eff7b6b13d37ab5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/wasm/wasm.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/wasm/wasm.prf | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/common/wasm/wasm.conf b/mkspecs/common/wasm/wasm.conf index b67d721352..adad999200 100644 --- a/mkspecs/common/wasm/wasm.conf +++ b/mkspecs/common/wasm/wasm.conf @@ -35,7 +35,6 @@ EMCC_COMMON_LFLAGS += \ --bind \ -s FETCH=1 \ -s MODULARIZE=1 \ - -s EXPORT_NAME=createQtAppInstance \ -s WASM_BIGINT=1 \ -s STACK_SIZE=5MB diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 0256fc2e49..72007fe863 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -15,6 +15,13 @@ exists($$QMAKE_QT_CONFIG) { } EMCC_LFLAGS += -s EXPORTED_RUNTIME_METHODS=$$EXPORTED_METHODS + !isEmpty(QT_WASM_EXPORT_NAME): { + EXPORT_NAME = $$QT_WASM_EXPORT_NAME + } else { + EXPORT_NAME = $${TARGET}_entry + } + EMCC_LFLAGS += -s EXPORT_NAME=$$EXPORT_NAME + qtConfig(thread) { EMCC_LFLAGS += -pthread |