diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-31 13:08:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-31 13:08:07 (GMT) |
| commit | 7e29bc1d96e9508616e42f2deb3346f7daef6ce4 (patch) | |
| tree | a4186a6d7c5e37cff815eba29fe9cc4deacbb844 | |
| parent | 56d84df24c891d23d65c1578d7339497d00679e3 (diff) | |
| parent | 4ddc7c52d6c00239f97e85c7fc5c20a0f87d3539 (diff) | |
| download | Qt-7e29bc1d96e9508616e42f2deb3346f7daef6ce4.zip Qt-7e29bc1d96e9508616e42f2deb3346f7daef6ce4.tar.gz Qt-7e29bc1d96e9508616e42f2deb3346f7daef6ce4.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"
Doc: Add `-xunitxml' option to qtestlib documentation
Fix crash in positionInLigature
Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index 3b338e3..8b9cc4f 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -198,6 +198,8 @@ outputs XML formatted results instead of plain text \o \c -lightxml \BR outputs results as a stream of XML tags + \o \c -xunitxml \BR + outputs results as an Xunit XML document \o \c -eventdelay \e ms \BR if no delay is specified for keyboard or mouse simulation (\l QTest::keyClick(), |