configure.ac | 2 --
distro-configs/LibreOfficeWASM32.conf | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 26d55de1a125401318e9fc57425f4ee8df81f991
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 22 11:30:06 2022 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Fri Jan 5 15:04:52 2024 +0100
Move Qt5 and scripting options for Emscripten to the distro-configs file
The resulting config_host.mk from running autogen.sh with just
--with-distro=LibreOfficeWASM32 is identical, so this should be safe.
Change-Id: I68ab81ba4e48c18d135a824c6158d725eb3f94da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143395
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 11e72e61b64bcabf5c599bc24e0b2f6b62c91b5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161671
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index 0c94e04acaca..0bfa249542e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,8 +1136,6 @@ emscripten)
test_system_freetype=no
enable_compiler_plugins=no
enable_customtarget_components=yes
- enable_qt5=yes
- enable_scripting=no
enable_split_debug=yes
enable_wasm_strip=yes
with_system_zlib=no
diff --git a/distro-configs/LibreOfficeWASM32.conf
b/distro-configs/LibreOfficeWASM32.conf
index b4a3f1dc6ae7..d7fc849b3cfa 100644
--- a/distro-configs/LibreOfficeWASM32.conf
+++ b/distro-configs/LibreOfficeWASM32.conf
@@ -1 +1,3 @@
--host=wasm32-local-emscripten
+--enable-qt5
+--disable-scripting
