configure.ac                          |    2 --
 distro-configs/LibreOfficeWASM32.conf |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 629ebd571bdcbf3c705e6ac8a03789923e20c361
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Tue Nov 22 11:30:06 2022 +0200
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Nov 22 12:01:32 2022 +0200

    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.

diff --git a/configure.ac b/configure.ac
index 41996406c74e..8b5214610d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1163,8 +1163,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

Reply via email to