Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c

1 files changed, 11 insertions, 5 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 56959ba62d..a4f1a39bbd 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -166,6 +166,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*! \macro QTRY_VERIFY_WITH_TIMEOUT(condition, timeout)
+   \since 5.0
 
    \relates QTest
 
@@ -183,6 +184,7 @@ QT_BEGIN_NAMESPACE
 
 
 /*! \macro QTRY_VERIFY(condition)
+   \since 5.0
 
    \relates QTest
 
@@ -195,6 +197,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*! \macro QTRY_COMPARE_WITH_TIMEOUT(actual, expected, timeout)
+   \since 5.0
 
    \relates QTest
 
@@ -211,6 +214,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*! \macro QTRY_COMPARE(actual, expected)
+   \since 5.0
 
    \relates QTest
 
@@ -360,6 +364,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*! \macro QFINDTESTDATA(filename)
+   \since 5.0
 
    \relates QTest
 
@@ -449,6 +454,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*! \macro QTEST_GUILESS_MAIN(TestClass)
+    \since 5.0
 
     \relates QTest
 
@@ -770,7 +776,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \fn char *QTest::toString(const QChar &character)
+    \fn char *QTest::toString(QChar character)
     \overload
 
     Returns a textual representation of the given \a character.
@@ -1186,7 +1192,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
          "     *** If no output format is specified, -txt is assumed.\n"
          "\n"
          " Detail options:\n"
-         " -silent             : Only outputs warnings and failures\n"
+         " -silent             : Only output failures and fatal errors in plain text output\n"
          " -v1                 : Print enter messages for each testfunction\n"
          " -v2                 : Also print out each QVERIFY/QCOMPARE/QTEST\n"
          " -vs                 : Print every signal emitted\n"
@@ -1449,6 +1455,9 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
         }
     }
 
+    bool installedTestCoverage = installCoverageTool(QTestResult::currentAppname(), QTestResult::currentTestObjectName());
+    QTestLog::setInstalledTestCoverage(installedTestCoverage);
+
     // If no loggers were created by the long version of the -o command-line
     // option, create a logger using whatever filename and format were
     // set using the old-style command-line options.
@@ -1987,9 +1996,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
 
     qtest_qParseArgs(argc, argv, false);
 
-    bool installedTestCoverage = installCoverageTool(argv[0], metaObject->className());
-    QTestLog::setInstalledTestCoverage(installedTestCoverage);
-
 #ifdef QTESTLIB_USE_VALGRIND
     if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
         const QStringList origAppArgs(QCoreApplication::arguments());