From f0485f57738a15ef14225352ecce078409e83de1 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@digia.com>
Date: Mon, 23 Apr 2012 20:57:02 +0200
Subject: [PATCH] Update deployment on Windows doc to include MSVC 2010
Also remove any reference to MSVC 6 and 2003 as these
are rather old compilers now.
Task-number: QTBUG-19263
Change-Id: I38f0734cdb175dbf99c76a8108cfa07e229d1875
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
---
doc/src/deployment/deployment.qdoc | 33 +++++++++++++++---------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 76ae8b9d..8631b798 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -693,19 +693,17 @@
\table 100%
\header
- \li \li VC++ 6.0 \li VC++ 7.1 (2003) \li VC++ 8.0 (2005) \li VC++ 9.0 (2008)
+ \li \li VC++ 8.0 (2005) \li VC++ 9.0 (2008) \li VC++ 10.0 (2010)
\row
\li The C run-time
- \li \c msvcrt.dll
- \li \c msvcr71.dll
\li \c msvcr80.dll
\li \c msvcr90.dll
+ \li \c msvcr100.dll
\row
\li The C++ run-time
- \li \c msvcp60.dll
- \li \c msvcp71.dll
\li \c msvcp80.dll
\li \c msvcp90.dll
+ \li \c msvcp100.dll
\endtable
To verify that the application now can be successfully deployed,
@@ -780,9 +778,9 @@
compiler version against the same C runtime version. This prevents
deploying errors caused by different versions of the C runtime libraries.
- \section2 Visual Studio 2008 And Manual Installs
+ \section2 Manual installations with Visual Studio 2008 and 2010
- As well as the above details for VS 2005 and onwards, Visual Studio 2008
+ As well as the above details for VS 2005 and onwards, Visual Studio 2008\2010
applications may have problems when deploying manually, say to a USB
stick.
@@ -829,26 +827,27 @@
\table 100%
\header
\li Qt
- \li VC++ 6.0
- \li VC++ 7.1 (2003)
\li VC++ 8.0 (2005)
+ \li VC++ 9.0 (2008)
+ \li VC++ 10.0 (2010)
\li MinGW
\row
\li \list
- \li QTCORE4.DLL - The QtCore runtime
- \li QTGUI4.DLL - The QtGui runtime
+ \li QTCORE5.DLL - The QtCore runtime
+ \li QTGUI5.DLL - The QtGui runtime
+ \li QTWIDGETS5.DLL - The QtWidgets runtime
\endlist
\li \list
- \li MSVCRT.DLL - The C runtime
- \li MSVCP60.DLL - The C++ runtime (only when STL is installed)
+ \li MSVCR80.DLL - The C runtime
+ \li MSVCP80.DLL - The C++ runtime
\endlist
\li \list
- \li MSVCR71.DLL - The C runtime
- \li MSVCP71.DLL - The C++ runtime (only when STL is installed)
+ \li MSVCR90.DLL - The C runtime
+ \li MSVCP90.DLL - The C++ runtime
\endlist
\li \list
- \li MSVCR80.DLL - The C runtime
- \li MSVCP80.DLL - The C++ runtime (only when STL is installed)
+ \li MSVCR100.DLL - The C runtime
+ \li MSVCP100.DLL - The C++ runtime
\endlist
\li \list
\li MINGWM10.DLL - The MinGW run-time
--
GitLab