diff options
| author | Lorn Potter <[email protected]> | 2025-04-25 05:05:31 +1000 |
|---|---|---|
| committer | Lorn Potter <[email protected]> | 2025-05-12 15:46:57 +1000 |
| commit | 5ff542493dba52934d92f86463395e33b874906e (patch) | |
| tree | 0f624ec9b6e5ab041dbe593e2ad89d83078d929b | |
| parent | 2db64357fa294ab4a445512df2e9c819c80c92a3 (diff) | |
wasm: stop removing all html and wasm files on distclean
moves setting QMAKE_DISTCLEAN to wasm/=.prf and only
remove files we create.
Fixes: QTBUG-134110
Done-with: Morten Johan Sørvig <[email protected]>
Pick-to: 6.9
Change-Id: I4b62cd423fe7814f8a39d67ae98bb61111b0618e
Reviewed-by: Morten Johan Sørvig <[email protected]>
| -rw-r--r-- | mkspecs/common/wasm/wasm.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/wasm/wasm.prf | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/common/wasm/wasm.conf b/mkspecs/common/wasm/wasm.conf index eb883a4f744..d036e3885b7 100644 --- a/mkspecs/common/wasm/wasm.conf +++ b/mkspecs/common/wasm/wasm.conf @@ -82,6 +82,4 @@ equals(QMAKE_HOST.os, Windows) { "$(AR) $(DESTDIR)$(TARGET) @$(OBJECTS_DIR)/$(TARGET).rsp" } -QMAKE_DISTCLEAN += *.html *.js *.wasm - load(qt_config) diff --git a/mkspecs/features/wasm/wasm.prf b/mkspecs/features/wasm/wasm.prf index 49a5b4baca6..a257f5f5cb5 100644 --- a/mkspecs/features/wasm/wasm.prf +++ b/mkspecs/features/wasm/wasm.prf @@ -24,6 +24,7 @@ exists($$QMAKE_QT_CONFIG) { EMCC_LFLAGS += -s EXPORT_NAME=$$EXPORT_NAME + qtConfig(thread) { EMCC_LFLAGS += -pthread @@ -59,6 +60,9 @@ exists($$QMAKE_QT_CONFIG) { } EMCC_LFLAGS += -s MAXIMUM_MEMORY=$$MAXIMUM_MEMORY + target_filename_base = $$replace(TARGET, \.js$, ) + QMAKE_DISTCLEAN += qtloader.js qtlogo.svg $${target_filename_base}.wasm $${target_filename_base}.js $${target_filename_base}.html + qtConfig(sse2) { QMAKE_CFLAGS += -O2 -msimd128 -msse -msse2 QMAKE_CXXFLAGS += -O2 -msimd128 -msse -msse2 |