diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-24 09:49:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-24 12:04:52 +0200 |
| commit | c96426f19f8c244c0f5748f0009016f576db9616 (patch) | |
| tree | f6365344e8a24415e7a67694af2f0c043bb0dae6 /src/testlib | |
| parent | 2137cb7dc5c902ce71855901c83c4c9d87b1ce2d (diff) | |
| parent | c5a3e5edd9e63b18abf1838c86a27a662224b02c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 1 | ||||
| -rw-r--r-- | src/testlib/qtestlog_p.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 67111d1642..00e7ac62c0 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2636,7 +2636,6 @@ void QTest::ignoreMessage(QtMsgType type, const char *message) \since 5.3 */ - void QTest::ignoreMessage(QtMsgType type, const QRegularExpression &messagePattern) { QTestLog::ignoreMessage(type, messagePattern); diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index 540ffe75eb..5d5ffd3f6f 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -78,7 +78,9 @@ public: static void addBenchmarkResult(const QBenchmarkResult &result); static void ignoreMessage(QtMsgType type, const char *msg); +#ifndef QT_NO_REGULAREXPRESSION static void ignoreMessage(QtMsgType type, const QRegularExpression &expression); +#endif static int unhandledIgnoreMessages(); static void printUnhandledIgnoreMessages(); static void clearIgnoreMessages(); |