diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 12:40:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 12:40:13 (GMT) |
| commit | d09806a6148bf84bc108eb26b193490c2229ca74 (patch) | |
| tree | e1473b7cbf285b312c8f8bfb35951bb39a6211ef /doc/src/development/qtestlib.qdoc | |
| parent | a6a8bee86f7e13d49d9115eb33aaee999bd15ad5 (diff) | |
| parent | 70d96d5d17c62fb97ce15967012527dd8b292316 (diff) | |
| download | Qt-d09806a6148bf84bc108eb26b193490c2229ca74.zip Qt-d09806a6148bf84bc108eb26b193490c2229ca74.tar.gz Qt-d09806a6148bf84bc108eb26b193490c2229ca74.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 build with namespaces in new cookie jar table
cookie jar code: enhance security by keeping track of effective TLDs
Add support for QMetaType::QVariant in ActiveQt
Fix QNetworkReply autotest cases for QT-3494
Add compiler optimization for QtScript/JSC on Symbian
improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[]
Improve docs for QTEST_MAIN macro.
Work around an apparent GCC optimiser bug accessing arrays beyond end
Do not crash in case a future version of libdbus has a new kind of message.
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/src/development/qtestlib.qdoc')
| -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 |