summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-19 12:08:56 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-23 13:52:46 +0200
commitc18c51acf8d0eb9426ce998d6e09f20a4a481c40 (patch)
tree3f314634c361f6ccb4e43d596370167003ec210a /src/webengine/doc
parentf43d9dc448f0fd2073f44ea696205969ffd0d9c8 (diff)
parent662de14ceecee701b31478849ae147c70f3fe00f (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: src/core/config/common.pri src/core/configure.json src/core/net/url_request_qrc_job_qt.cpp src/core/ozone/surface_factory_qt.cpp src/core/web_contents_adapter.cpp Change-Id: If679aa179123f793639da3d8ee4ab5d116707754
Diffstat (limited to 'src/webengine/doc')
-rw-r--r--src/webengine/doc/src/qtwebengine-platform-notes.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
index fefb47795..5b7d750ff 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
@@ -69,7 +69,12 @@
\section2 Windows
- On Windows, Visual Studio 2017 and Windows 10 SDK are required.
+ On Windows, the following additional tools are required:
+
+ \list
+ \li Visual Studio 2017 version 15.8 or later
+ \li Windows 10 SDK
+ \endlist
\QWE can only be built on 64-bit Windows, with a x64-bit toolchain.
For building \QWE for x86 applications, you need to configure