diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-10 14:39:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-12 12:46:13 +0200 |
| commit | 4629185e555e6c891d6308ae7cafa584ce6d731f (patch) | |
| tree | 1ed9f01ec7fdb6f52a607cab0a31b60bb60179d2 /src/webenginequick/doc | |
| parent | f8527fa9427984082cd425d304d29fd030ff5b1a (diff) | |
| parent | 5d41d39b82acb3e2da597df0588fb906e212d608 (diff) | |
| download | qtwebengine-4629185e555e6c891d6308ae7cafa584ce6d731f.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/webenginewidgets/printme/printhandler.cpp
src/3rdparty
src/core/api/qwebenginepage_p.h
src/core/content_browser_client_qt.h
src/core/web_contents_adapter_client.h
src/core/web_contents_delegate_qt.cpp
src/core/web_contents_delegate_qt.h
src/webenginequick/api/qquickwebengineview_p_p.h
tests/auto/quick/qmltests/data/tst_download.qml
tests/auto/quick/qmltests/data/tst_viewSoure.qml
tests/auto/widgets/loadsignals/tst_loadsignals.cpp
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
Change-Id: I9c1819ec15e13d4f8e244defe860e26274b5d4be
Diffstat (limited to 'src/webenginequick/doc')
| -rw-r--r-- | src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc b/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc index 6356b97af..e32424eea 100644 --- a/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc @@ -65,7 +65,7 @@ \li \l Python 2.7.5 or later. Python 3 is not supported. \li Bison, Flex \li GPerf - \li Node.js for a full featured Dev Tools. + \li Node.js version 8 or later (version 12 or later is recommended) \endlist \section2 Windows @@ -73,7 +73,7 @@ On Windows, the following additional tools are required: \list - \li Visual Studio 2017 version 15.8 or later + \li Visual Studio 2017 version 15.8 or later, or clang-cl version 8 or later \li Active Template Library (ATL), usually included in the Visual Studio installation \li Windows 10 SDK version 10.0.19041 or later |