summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-01-05 09:12:13 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2022-01-05 09:33:45 +0100
commitfad29b065709d8b17becb4f4b6b8e6c08fd5aa6e (patch)
treed9f6832bd3961cfff90ccaf034e86c6809503078
parent350cf201d47ea101eba44221605ef67b0c3492c3 (diff)
downloadqtdoc-fad29b065709d8b17becb4f4b6b8e6c08fd5aa6e.tar.gz
Doc: Polish WebAssembly build instructions
Don't claim that we can add values to QT_HOST_PATH. Don't confuse environment and CMake variables. Favor -platform instead of the deprecated -xplatform argument. Don't hard-code version numbers. Change-Id: I26842168597ab42463af7ca0c75b8e1e7b8502b0 (cherry picked from commit 388b3a331c864b8720d67f211e91d425ade1c718) Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
-rw-r--r--doc/src/platforms/webasm.qdoc16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/src/platforms/webasm.qdoc b/doc/src/platforms/webasm.qdoc
index 355cf62e..2b66dc5f 100644
--- a/doc/src/platforms/webasm.qdoc
+++ b/doc/src/platforms/webasm.qdoc
@@ -115,22 +115,24 @@ configure options. Thread support and building of the examples can be enabled
by removing the corresponding disabling option. Shared library builds are not
supported at this time.
-For Qt 6, you will need a host build of the same version of Qt and
-add that path to QT_HOST_PATH by using the \c -qt-host-path configure argument.
+You need a host build of the same version of Qt and specify that path in the \e
+QT_HOST_PATH CMake variable or by using the \c -qt-host-path configure argument.
-Although it should be detected, you may optionally set the CMAKE_TOOLCHAIN_PATH to the
-Emscripten.cmake toolchain file that comes with Emscripten sdk, by using the
--DCMAKE_TOOLCHAIN_FILE= configure argument.
+Although it should be detected, you may optionally set the
+\e{CMAKE_TOOLCHAIN_FILE} CMake variable to the Emscripten.cmake toolchain file
+that comes with Emscripten SDK. This can be done by setting the environment
+variable \e{CMAKE_TOOLCHAIN_FILE} or by passing
+\c{CMAKE_TOOLCHAIN_FILE=/path/to/Emscripten.cmake} to configure.
\badcode
- ./configure -qt-host-path /path/to/Qt/6.2.0/platform -xplatform wasm-emscripten -prefix $PWD/qtbase
+ ./configure -qt-host-path /path/to/Qt -platform wasm-emscripten -prefix $PWD/qtbase
\endcode
On Windows, make sure you have \c MinGW in your \c PATH
and configure with the following:
\badcode
- configure -qt-host-path C:\Path\to\Qt6 -no-warnings-are-errors -xplatform wasm-emscripten -platform win32-g++ -prefix %CD%\qtbase
+ configure -qt-host-path C:\Path\to\Qt -no-warnings-are-errors -platform wasm-emscripten -prefix %CD%\qtbase
\endcode
Build required modules: