summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-31 03:00:43 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-03-31 03:00:43 +0200
commite3d74af3849ba2c1c5e9e1f369849021feb7f272 (patch)
treefbf2f6866bfcd7fc20807581e44ba1a20dc1592f
parent752816a86f93c200d45d405df2f972d6eba9c23d (diff)
parent7634e39bccf807fad270fa95a7d55a70d1cb3839 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3
-rw-r--r--doc/src/platforms/webasm.qdoc6
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/src/platforms/webasm.qdoc b/doc/src/platforms/webasm.qdoc
index 2379ac2e3..2586153be 100644
--- a/doc/src/platforms/webasm.qdoc
+++ b/doc/src/platforms/webasm.qdoc
@@ -73,13 +73,9 @@ Use \c emsdk to install specific \c emscripten versions. For example, to install
it for Qt 5.13, enter:
\list
\li ./emsdk install sdk-fastcomp-1.38.27-64bit
- \li ./emsdk activate --embedded sdk-fastcomp-1.38.27-64bit
+ \li ./emsdk activate sdk-fastcomp-1.38.27-64bit
\endlist
-The \c --embedded option is useful if you want to install multiple versions of the SDK.
-It locates all configuration and cache files inside the SDK so that multiple versions
-do not conflict.
-
After installation, you should have emscripten in your path. Check this with the following command:
\badcode