summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-14 16:21:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-14 16:21:58 (GMT)
commitfa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9 (patch)
tree09b57189c4546d7e66bf68e9a2f764857d1ca4a5
parentaddd6b48d4f94a0591367fa460e6533100fbe228 (diff)
parenta591b4c3a537757781197dd78ad326c27c3aef66 (diff)
downloadQt-fa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9.zip
Qt-fa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9.tar.gz
Qt-fa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Typo fix in qtestlib
-rw-r--r--src/testlib/qtestcase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 5eff8a8..6591481 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -964,7 +964,7 @@ static void qParseArgs(int argc, char *argv[])
" -xunitxml : Outputs results as XML XUnit document\n"
" -xml : Outputs results as XML document\n"
" -lightxml : Outputs results as stream of XML tags\n"
- " -flush : Flushes the resutls\n"
+ " -flush : Flushes the results\n"
" -o filename: Writes all output into a file\n"
" -silent : Only outputs warnings and failures\n"
" -v1 : Print enter messages for each testfunction\n"