From a0ac17891b6fe6b296988e922b90f6d5166ea24d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 29 Nov 2023 14:20:40 +0100 Subject: [PATCH] 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.5 Change-Id: I5b47572f6e2a71edb47cbe224801a719ff1e060d Reviewed-by: Jason McDonald (cherry picked from commit 85842da95b5a7821b44d83e5d26922a3d07ef6cf) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qtestcase.h | 3 --- src/testlib/qtestcase.qdoc | 7 ------- 2 files changed, 10 deletions(-) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 7eea2b7b324..05ab56231d6 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -352,9 +352,6 @@ namespace QTest return Internal::toString(t); } - template - inline char *toString(const QPair &pair); - template inline char *toString(const std::pair &pair); diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index 5776177cf6b..baae09ee93f 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -1363,13 +1363,6 @@ moving the mouse pointer. */ -/*! - \fn template char *QTest::toString(const QPair &pair) - \overload - \since 5.11 - Returns a textual representation of the \a pair. -*/ - /*! \fn template char *QTest::toString(const std::pair &pair) \overload