README.wasm | 6 ++++++ configure.ac | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit b200cb7f9bfdcf7a62836505e2f2e6f917da1fd0 Author: Thorsten Behrens <[email protected]> AuthorDate: Sun Jan 24 22:29:38 2021 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Sun Jan 24 22:29:38 2021 +0100 Make qt5 src download options explicit Change-Id: Id2e78f71e10b8736cb03e42b1d0ad52c851cadd3 diff --git a/README.wasm b/README.wasm index cbc08a40a490..2dbe16010c8d 100644 --- a/README.wasm +++ b/README.wasm @@ -42,6 +42,12 @@ https://doc.qt.io/qt-5/wasm.html I originally build the Qt 5.15 branch, but probably better to build a tag like v5.15.2. +So: + +git clone https://github.com/qt/qt5.git +cd qt5 +git checkout v5.15.2 +./init-repository ./configure -xplatform wasm-emscripten -feature-thread -compile-examples -prefix $PWD/qtbase make -j<CORES> module-qtbase module-qtdeclarative commit 292e7251a31467838ecc50832521ce43dade5f13 Author: Thorsten Behrens <[email protected]> AuthorDate: Sun Jan 24 22:28:47 2021 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Sun Jan 24 22:28:47 2021 +0100 Change order of qmake search Otherwise we'd find local, non-emscription installation before the QT5DIR-provided one Change-Id: I956431c3433932adf1bee04ff8ce1cadfa0a4d81 diff --git a/configure.ac b/configure.ac index 6cb898c20593..df5fca405c1e 100644 --- a/configure.ac +++ b/configure.ac @@ -12430,7 +12430,7 @@ then fi dnl Check for qmake5 - AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH]) + AC_PATH_PROGS( QMAKE5, [qmake], no, [$QT5DIR/bin:$PATH]) if test "$QMAKE5" = "no"; then AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) else commit f1c51f2ecd7acae64effb0a4e4412d06e56628c8 Author: Thorsten Behrens <[email protected]> AuthorDate: Sat Dec 19 22:50:49 2020 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Fri Jan 22 23:34:08 2021 +0100 Hack out vs-code config.in Change-Id: If3b9a9684f43ffaeaebbccd1545e168d6b5f74b4 diff --git a/configure.ac b/configure.ac index 403c95977b4d..6cb898c20593 100644 --- a/configure.ac +++ b/configure.ac @@ -14076,8 +14076,7 @@ AC_CONFIG_FILES([config_host.mk bin/officeotron.sh hardened_runtime.xcent instsetoo_native/util/openoffice.lst - sysui/desktop/macosx/Info.plist - vs-code-template.code-workspace:.vscode/vs-code-template.code-workspace.in]) + sysui/desktop/macosx/Info.plist]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_box2d.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
