diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:26 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:44:27 +0300 |
| commit | 0ab63b035a649dc1982c867cd37d466d249004b9 (patch) | |
| tree | 6de22edcd3957aae3eee698136a000e52ab7f8fe /src/testlib | |
| parent | a6f8aa0ae1d5a1d1099df1891ea60b14b6eb6065 (diff) | |
| parent | 0cb2c760c219514849ab0f6be8e5368f92dfa5d9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 7b225ef5b4..3ab3fcc44c 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2591,10 +2591,10 @@ void QTest::ignoreMessage(QtMsgType type, const char *message) /*! \overload - Ignores messages created by qDebug() or qWarning(). If the \a message + Ignores messages created by qDebug() or qWarning(). If the message matching \a messagePattern with the corresponding \a type is outputted, it will be removed from the - test log. If the test finished and the \a message was not outputted, + test log. If the test finished and the message was not outputted, a test failure is appended to the test log. \b {Note:} Invoking this function will only ignore one message. |