diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-25 15:43:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 12:17:45 +0200 |
| commit | cb57d36f4559faf63acdca2cfb7b35431b959164 (patch) | |
| tree | 6605f7c9c28fdd9cc2bb7c2c729697d47143f05b /src/testlib/qtestcase.h | |
| parent | 24b99f819cdd78d3e0feee4847e69d62e41fd7ef (diff) | |
Make QTest::qWarn() use __FILE__ and __LINE__.
This change makes QTest::qWarn() consistent with similar testlib
functions, which take __FILE__ and __LINE__.
Change-Id: I12977cb30672899ab38877b4a656f0cc0c7ea02c
Reviewed-on: http://codereview.qt-project.org/3559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index b08b22e52b..b3ac5f0c4f 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -109,7 +109,7 @@ do {\ } while (0) #define QWARN(msg)\ - QTest::qWarn(msg) + QTest::qWarn(msg, __FILE__, __LINE__) class QObject; class QTestData; @@ -139,7 +139,7 @@ namespace QTest Q_TESTLIB_EXPORT void qSkip(const char *message, SkipMode mode, const char *file, int line); Q_TESTLIB_EXPORT bool qExpectFail(const char *dataIndex, const char *comment, TestFailMode mode, const char *file, int line); - Q_TESTLIB_EXPORT void qWarn(const char *message); + Q_TESTLIB_EXPORT void qWarn(const char *message, const char *file = 0, int line = 0); Q_TESTLIB_EXPORT void ignoreMessage(QtMsgType type, const char *message); Q_TESTLIB_EXPORT void *qData(const char *tagName, int typeId); |