diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/testlib/qtestcase.cpp | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r-- | src/testlib/qtestcase.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index e867b9629a..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 @@ -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" |