summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-12-30 21:32:53 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-12-30 21:32:53 +1000
commita96672bc77642e3e5a030fd9e78f700b47e11ccb (patch)
tree689860ec9c1725a29882c584c8329bb0e3963f18
parent5e3e9c5600e3089073990fd752e0eaa0336c6301 (diff)
parent1e4c00f4a1844c040f24162844ed35d624ef59d2 (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging: Doc: Add `-xunitxml' option to qtestlib documentation
-rw-r--r--doc/src/development/qtestlib.qdoc2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 80bf8382e0..d0264f836d 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -195,6 +195,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(),