Update Windows-specific documentation

- Remove any mention of MSVC 2013.

- Update the deployment section:
  - Mention style plugins required after
    qtbase/4f3249f32dbe5c20aabbfd9b4f9c558aaf449e48.
  - Standardize tables in "Creating the Application Package"
  - List files for dynamic OpenGL, which is the default now
  - Move ICU section to bottom.

- Update build instructions to MSVC 2017 and add more recommended
  configure options.

Task-number: QTBUG-66743
Change-Id: I8b97104b9d5c5429d7e79248dd97e89bd270d65d
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

1 files changed, 34 insertions, 30 deletions

diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index e5353cc05..de94e7263 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -405,8 +405,8 @@
 
     \section2 Visual Studio
 
-    Qt can be built with Visual Studio 2013 (Update 1), Visual Studio 2015 (Update 2),
-    Visual C++ Build Tools 2015, Visual Studio 2017, and Build Tools for Visual Studio 2017.
+    Qt can be built with Visual Studio 2015 (Update 2), Visual Studio 2017,
+    and Build Tools for Visual Studio 2017 (see also \l {Supported Platforms}).
 
     \section2 Intel C++ Compiler (Windows, Altix)
 
@@ -717,9 +717,10 @@
     is a subdirectory named \c {platforms}. \l{Qt Plugins} section has
     additional information about plugins and how Qt searches for them.
 
-    If \l{ANGLE} or dynamic OpenGL (the default) is used, you additionally
-    need to include both \c libEGL.dll and \c libGLESv2.dll from Qt's \c lib
-    directory as well as the HLSL compiler from DirectX. The HLSL compiler
+    If dynamic OpenGL is used, you additionally need to include the
+    libraries required for \l{ANGLE} and software rendering. For \l{ANGLE},
+    both \c libEGL.dll and \c libGLESv2.dll from Qt's \c lib directory are
+    required as well as the HLSL compiler from DirectX. The HLSL compiler
     library, d3dcompiler_XX.dll, where XX is the version number that ANGLE
     (libGLESv2) was linked against.
 
@@ -779,6 +780,9 @@
         \li The Qt Windows platform plugin
         \li {2, 1} \c platforms\qwindows.dll
     \row
+        \li The Qt Windows Vista style plugin
+        \li {2, 1} \c styles\qwindowsvistastyle.dll
+    \row
         \li The Qt Core module
         \li {2, 1} \c Qt5Core.dll
     \row
@@ -789,43 +793,48 @@
         \li {2, 1} \c Qt5Widgets.dll
     \endtable
 
+    Other plugins might be required depending on the features the application uses
+    (\c iconengines, \c imageformats).
+
     In addition, the archive must contain the following compiler
-    specific libraries depending on your version of Visual Studio:
+    specific libraries (assuming Visual Studio 14.0 (2015) or 15.0 (2017)):
 
     \table 100%
     \header
-        \li \li VC++ 12.0 (2013) \li VC++ 14.0 (2015)
+        \li Component \li {2, 1} File Name
     \row
         \li The C run-time
-        \li \c msvcr120.dll
-        \li \c vccorlib140.dll, \c vcruntime140.dll
+        \li {2, 1} \c vccorlib140.dll, \c vcruntime140.dll
     \row
         \li The C++ run-time
-        \li \c msvcp120.dll
-        \li \c msvcp140.dll
+        \li {2, 1} \c msvcp140.dll
     \endtable
 
-    If Qt was configured to use ICU, the archive must contain:
+    If dynamic OpenGL was used, then the archive must additionally contain:
 
     \table 100%
     \header
-        \li{3,1} File Name
+        \li Component \li {2, 1} File Name
     \row
-        \li icudtXX.dll
-        \li icuinXX.dll
-        \li icuucXX.dll
+        \li ANGLE libraries
+        \li {2, 1} libEGL.dll, libGLESv2.dll
+    \row
+        \li HLSL compiler library for ANGLE
+        \li {2, 1} d3dcompiler_XX.dll
+    \row
+        \li OpenGL Software renderer library
+        \li opengl32sw.dll
     \endtable
 
-    Finally, if ANGLE was used, then the archive must additionally
-    contain:
+    Finally, if Qt was configured to use ICU, the archive must contain:
 
     \table 100%
     \header
-        \li{2,1} File Name
+        \li{3,1} File Name
     \row
-        \li libEGL.dll
-        \li libGLESv2.dll
-        \li d3dcompiler_XX.dll
+        \li icudtXX.dll
+        \li icuinXX.dll
+        \li icuucXX.dll
     \endtable
 
     To verify that the application now can be successfully deployed,
@@ -929,7 +938,6 @@
     \table 100%
         \header
             \li Qt
-            \li VC++ 12.0 (2013)
             \li VC++ 14.0 (2015)
             \li MinGW
         \row
@@ -939,10 +947,6 @@
                \li QT5WIDGETS.DLL - The QtWidgets runtime
            \endlist
         \li \list
-               \li MSVCR120.DLL - The C runtime
-               \li MSVCP120.DLL - The C++ runtime
-           \endlist
-        \li \list
                \li VCCORLIB140.DLL, VCRUNTIME140D.DLL - The C runtime
                \li MSVCP140.DLL - The C++ runtime
            \endlist
@@ -1070,8 +1074,8 @@
         and the Qt folder is called \c qt-5 and located under \c C:\qt:
 
         \code
-        REM Set up \Microsoft Visual Studio 2013, where <arch> is \c amd64, \c x86, etc.
-        CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" <arch>
+        REM Set up \Microsoft Visual Studio 2017, where <arch> is \c amd64, \c x86, etc.
+        CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" <arch>
         SET _ROOT=C:\qt\qt-5
         SET PATH=%_ROOT%\qtbase\bin;%_ROOT%\gnuwin32\bin;%PATH%
         REM Uncomment the below line when using a git checkout of the source repository
@@ -1103,7 +1107,7 @@
         the following command in the command prompt:
 
         \code
-        configure -debug -nomake examples -opensource
+        configure -debug -nomake examples -nomake tests -skip qtwebengine -opensource
         \endcode
 
         The \l{Qt Configure Options}{Configure Options} page contains more