Commit d2ea5adc authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	.qmake.conf

Change-Id: Ia358bab01504a9b088a356100eff158efff56896
Showing with 3 additions and 2 deletions
...@@ -66,13 +66,14 @@ The known-good versions are: ...@@ -66,13 +66,14 @@ The known-good versions are:
\list \list
\li Qt 5.12: 1.38.16 \li Qt 5.12: 1.38.16
\li Qt 5.13: 1.38.27 (multithreading: 1.38.30) \li Qt 5.13: 1.38.27 (multithreading: 1.38.30)
\li Qt 5.14: 1.38.27 (multithreading: 1.38.30)
\endlist \endlist
Use \c emsdk to install specific \c emscripten versions. For example, to install Use \c emsdk to install specific \c emscripten versions. For example, to install
it for Qt 5.13, enter: it for Qt 5.13, enter:
\list \list
\li ./emsdk install sdk-1.38.27-64bit \li ./emsdk install sdk-fastcomp-1.38.27-64bit
\li ./emsdk activate --embedded sdk-1.38.27-64bit \li ./emsdk activate --embedded sdk-fastcomp-1.38.27-64bit
\endlist \endlist
The \c --embedded option is useful if you want to install multiple versions of the SDK. The \c --embedded option is useful if you want to install multiple versions of the SDK.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment