From e4d59b698ee1afcc4ab6442c033fc597f93d0e2b Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Thu, 16 Jan 2025 17:58:55 +0100 Subject: [PATCH] Fix docs for new QDebug streaming operators of std containers Added the missing function declarations to the #if Q_QDOC part of the header. Also fixed a typo in the std::unordered_map docs. Amends 850d4895be565931d18c92e5e2f9a33b7f26de6d, 0c96528e8d43ad4309bdca14b179a5045984655a, a9fe57fefaac0cb047e4c02e0b8c8f8327e0a58c, and a8c9a5617c72ad2e55bf497df6ff2c2e141cbdef. Found in Qt 6.9 API review. Change-Id: I792023b506e2afdbdca4bca3197887e50c98a788 Reviewed-by: Marc Mutz (cherry picked from commit 256b56f581a66acde829a2f47b3d0f6ed464fb44) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qdebug.cpp | 2 +- src/corelib/io/qdebug.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 12adcf947df..95efa006460 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -1216,7 +1216,7 @@ QDebug &QDebug::putTupleLikeImplImpl(const char *ns, const char *what, */ /*! - \fn template QDebug operator<<(QDebug debug, const std::unordered_map &unordered_map) + \fn template QDebug operator<<(QDebug debug, const std::unordered_map &map) \relates QDebug \since 6.9 diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 3fd7ea7223f..b5053e827a1 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -569,6 +569,18 @@ QDebug operator<<(QDebug debug, const std::pair &pair); template QDebug operator<<(QDebug debug, const QContiguousCache &cache); +template +QDebug operator<<(QDebug debug, const std::multiset &multiset); + +template +QDebug operator<<(QDebug debug, const std::set &set); + +template +QDebug operator<<(QDebug debug, const std::unordered_map &unordered_map); + +template +QDebug operator<<(QDebug debug, const std::unordered_set &unordered_set); + #endif // Q_QDOC template