diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 18:36:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 18:36:16 (GMT) |
| commit | e753230a048097e6d041ec1ff9d632c4b3b0322b (patch) | |
| tree | 830b7dc38f501c262902e9125326877300282f94 /doc/src/development | |
| parent | 27c18a5cd8dbe2d22c8717044922ad5437e6fff4 (diff) | |
| parent | 8925f402a2b8f6ac00566d917275046e77c6775c (diff) | |
| download | Qt-e753230a048097e6d041ec1ff9d632c4b3b0322b.zip Qt-e753230a048097e6d041ec1ff9d632c4b3b0322b.tar.gz Qt-e753230a048097e6d041ec1ff9d632c4b3b0322b.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:
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/src/development')
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 2 |
1 files changed, 1 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 |