diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
commit | cda76002257d56ffedbf8d28211cfd66a7226e73 (patch) | |
tree | 03e8a7fcdfa389771d6ade5afbe5d2536328eef2 /src/webengine/doc/src/qtwebengine-platform-notes.qdoc | |
parent | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (diff) | |
parent | 631f1dd72027207cf6c49a380671c58f096a37a5 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/api/qtbug-60565.cpp
Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-platform-notes.qdoc')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 5d32fa6c7..1b8320c0c 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -75,7 +75,7 @@ \li Visual Studio 2017 version 15.8 or later \li Active Template Library (ATL), usually included in the Visual Studio installation - \li Windows 10 SDK + \li Windows 10 SDK version 10.0.18362 or later \endlist \QWE can only be built on 64-bit Windows, with a x64-bit toolchain. |