diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 09:44:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 10:17:04 +0200 |
| commit | 95baba26936cdabe5cf4d5eaa4d59f97e4a2102d (patch) | |
| tree | 5fd4c75167a5a040bb34aeec54d5e8ef2a06f137 /src/webengine/doc/src/qtwebengine-platform-notes.qdoc | |
| parent | 32b67aea15fdf47d6b86e1e5303d25ec6e8ded37 (diff) | |
| parent | dd7c3f92c4668ed9ebdb1714d00de1cb61ab7dd4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
configure.json
configure.pri
src/3rdparty
Change-Id: I2e0614b33596fe66999508556c464ed84acc8e2f
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-platform-notes.qdoc')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 6c8703fe4..59429ec5a 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -71,6 +71,12 @@ On Windows, Visual Studio 2017 and Windows 10 SDK are required. + Qt WebEngine can only be built on 64-bit Windows, with a x64-bit toolchain. + For building Qt WebEngine for x86 applications, you need to configure + and compile Qt with the Visual Studio 2017 x64 to x86 cross-compile + toolchain. This toolchain can be set up on the command line by running + \c{vcvarsall.bat amd64_x86}. + \section2 Linux On Linux, Clang or GCC version 5 or later is required. |