diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 08:59:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-22 08:59:14 (GMT) |
| commit | 94f786b0cdb6b6572c99ee6ce954aab05d461e6a (patch) | |
| tree | 631fa56545b7368d1b68ec9b2f422b28af794229 /doc | |
| parent | 51ca2e67fe20c3de5740279837916b8bcc4f7060 (diff) | |
| parent | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (diff) | |
| download | Qt-94f786b0cdb6b6572c99ee6ce954aab05d461e6a.zip Qt-94f786b0cdb6b6572c99ee6ce954aab05d461e6a.tar.gz Qt-94f786b0cdb6b6572c99ee6ce954aab05d461e6a.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:
Docs: QTBUG-9150 Incorrect snippet in class doc.
tst_headers: make failure more detailed when failing to open a file
Fix number of chapters in qtestlib tutorial.
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/development/qtestlib.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/getting-started/installation.qdoc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 08fdfc6..afe6e34 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -370,7 +370,7 @@ \title QTestLib Tutorial This tutorial gives a short introduction to how to use some of the - features of the QTestLib framework. It is divided into four + features of the QTestLib framework. It is divided into five chapters: \list 1 diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index aa10aaf..4941325 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&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 |