summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-11-29 14:20:40 +0100
committerMarc Mutz <marc.mutz@qt.io>2023-12-06 17:22:41 +0000
commit85842da95b5a7821b44d83e5d26922a3d07ef6cf (patch)
tree496b5f8ee05b48e5cd9eddcb077c7049fd3486c9
parent1c06f86d255d3d92201b1092794a4c1ea403c24d (diff)
Remove unneeded toString(QPair) declaration
It's literally the same as the std::pair one that immediately follows it, because QPair these days is just a template alias for std::pair. Wasn't flagged as an error because it's just a declaration, not a definition. Pick-to: 6.6 6.5 Change-Id: I5b47572f6e2a71edb47cbe224801a719ff1e060d Reviewed-by: Jason McDonald <macadder1@gmail.com>
-rw-r--r--src/testlib/qtestcase.h3
-rw-r--r--src/testlib/qtestcase.qdoc7
2 files changed, 0 insertions, 10 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 7eea2b7b32..05ab56231d 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -353,9 +353,6 @@ namespace QTest
}
template <typename T1, typename T2>
- inline char *toString(const QPair<T1, T2> &pair);
-
- template <typename T1, typename T2>
inline char *toString(const std::pair<T1, T2> &pair);
template <class... Types>
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc
index 5776177cf6..baae09ee93 100644
--- a/src/testlib/qtestcase.qdoc
+++ b/src/testlib/qtestcase.qdoc
@@ -1364,13 +1364,6 @@
*/
/*!
- \fn template <typename T1, typename T2> char *QTest::toString(const QPair<T1, T2> &pair)
- \overload
- \since 5.11
- Returns a textual representation of the \a pair.
-*/
-
-/*!
\fn template <typename T1, typename T2> char *QTest::toString(const std::pair<T1, T2> &pair)
\overload
\since 5.11