summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-20 17:58:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-20 17:58:41 (GMT)
commitecc25948e717c0dea3cd11919a1fda231e49b4ad (patch)
treeac797c3b5d9a1db1a3148e3d81729766a58ae699 /doc
parent987a683ff51997cb23cb931af99c6554651742d7 (diff)
parentd9dbdb1afde441c8ab87f42b4a5e0e29ad54480c (diff)
downloadQt-ecc25948e717c0dea3cd11919a1fda231e49b4ad.zip
Qt-ecc25948e717c0dea3cd11919a1fda231e49b4ad.tar.gz
Qt-ecc25948e717c0dea3cd11919a1fda231e49b4ad.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/getting-started/installation.qdoc1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index a68310c..5b009cd 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -963,6 +963,7 @@ We hope you will enjoy using Qt.
first install the Visual Studio Service Pack 1 available
\l{http://www.microsoft.com/downloads/details.aspx?FamilyId=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&amp;displaylang=en}{here}
to avoid runtime conflicts.
+ Additionally, you must use the Check for Updates feature in the Help menu of the Visual Studio 2005 IDE to apply at least the following security updates: KB937061, KB971023, KB971090, KB973673.
If you are using a source edition of Qt, you must first install Perl so
that the syncqt script invoked by configure can be executed. You can download