summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/testlib/qtestcase.h16
-rw-r--r--src/testlib/qtestcase.qdoc1
2 files changed, 14 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 158fce4e3d..55419551fa 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -208,9 +208,6 @@ do {\
return;\
} while (false)
-#define QWARN(msg)\
- QTest::qWarn(static_cast<const char *>(msg), __FILE__, __LINE__)
-
#ifdef QT_TESTCASE_BUILDDIR
#ifndef QT_TESTCASE_SOURCEDIR
@@ -576,6 +573,19 @@ namespace QTest
#undef QTEST_COMPARE_DECL
+#if QT_DEPRECATED_SINCE(6, 2)
+namespace QTestPrivate {
+QT_DEPRECATED_VERSION_X_6_2("Use qWarning() instead")
+Q_DECL_UNUSED static inline void qWarnMacro(const char *message, const char *file = nullptr, int line = 0)
+{
+ QTest::qWarn(message, file, line);
+}
+}
+#endif
+
+#define QWARN(msg) \
+ QTestPrivate::qWarnMacro(static_cast<const char *>(msg), __FILE__, __LINE__)
+
QT_END_NAMESPACE
#endif
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc
index 2a480fb349..9950418a5c 100644
--- a/src/testlib/qtestcase.qdoc
+++ b/src/testlib/qtestcase.qdoc
@@ -336,6 +336,7 @@
\relates QTest
\threadsafe
+ \deprecated Use qWarning() instead.
Appends \a message as a warning to the test log. This macro can be used anywhere
in your tests.