summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-03-01 17:02:31 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-03-05 06:00:39 +0100
commit9e31631557ea3f99506377ff91a1e15e942f9e88 (patch)
tree8a00cd9f77e1188ae6ab6fad9999a0075e7af43d /src
parent9ec61d446030da35fcc7c809c5d736397a99258e (diff)
Doc: fix link to QTest::failOnWarning
Also fix incorrect failOnWarning*s* elsewhere in comments. Pick-to: 6.5 6.5.0 Change-Id: I0bbc5e71060348153876f3d9a7c77c67f3c2e00d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/testlib/doc/src/qttest-best-practices.qdoc6
-rw-r--r--src/testlib/qtestlog.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/testlib/doc/src/qttest-best-practices.qdoc b/src/testlib/doc/src/qttest-best-practices.qdoc
index 4220312149..54a51f4ace 100644
--- a/src/testlib/doc/src/qttest-best-practices.qdoc
+++ b/src/testlib/doc/src/qttest-best-practices.qdoc
@@ -383,12 +383,12 @@
only tell you whether \e{the test} was built in debug mode, and that does
not guarantee that the \e{Qt libraries} were also built in debug mode.
- Your tests can (since Qt 6.3) verify that they do not trigger calls to \l
- qWarning() by calling \l QTest::failOnWarnings(). This takes the warning
+ Your tests can (since Qt 6.3) verify that they do not trigger calls to
+ \l qWarning() by calling \l QTest::failOnWarning(). This takes the warning
message to test for or a \l QRegularExpression to match against warnings; if
a matching warning is produced, it will be reported and cause the test to
fail. For example, a test that should produce no warnings at all can
- \c{QTest::failOnWarnings(QRegularExpression(u".*"_s))}, which will match any
+ \c{QTest::failOnWarning(QRegularExpression(u".*"_s))}, which will match any
warning at all.
You can also set the environment variable \c QT_FATAL_WARNINGS to cause
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index dca4bc1c10..e01da37911 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -179,7 +179,7 @@ namespace QTest {
static bool handleFailOnWarning(const QMessageLogContext &context, const QString &message)
{
- // failOnWarnings can be called multiple times per test function, so let
+ // failOnWarning can be called multiple times per test function, so let
// each call cause a failure if required.
for (const auto &pattern : failOnWarningList) {
if (pattern.metaType() == QMetaType::fromType<QString>()) {