From 0174df3a4bcf9ad3029e23e55f629a9b80dcf91e Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 25 Oct 2024 15:42:01 +0200 Subject: [PATCH] Docs: Fix QScoped(Array)Pointer::swap() deprecation version The code tells that it was deprecated since 6.2, but the docs were incorreclty mentioning 6.1. Fix it. Amends fe9d7bf759d116f99131d14ac8b1fb44b2bc62fd and a2c8184b6b241b063e9af005edf082e653dfd8a6. Pick-to: 6.5 6.2 Change-Id: Icff14ccc5d581d27d721241e8d594ac9fad8e7a6 Reviewed-by: Thiago Macieira (cherry picked from commit 65e9c215ff25f7b97520a2b502548c5f5af0e589) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qscopedpointer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index 515eb9dc751..17d9264ba7f 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -229,7 +229,7 @@ QT_BEGIN_NAMESPACE /*! \fn template void QScopedPointer::swap(QScopedPointer &lhs, QScopedPointer &rhs) - \deprecated [6.1] Use \c std::unique_ptr instead; this function may let a pointer + \deprecated [6.2] Use \c std::unique_ptr instead; this function may let a pointer escape its scope. Swaps \a lhs with \a rhs. @@ -305,7 +305,7 @@ QT_BEGIN_NAMESPACE /*! \fn template void QScopedArrayPointer::swap(QScopedArrayPointer &other) - \deprecated [6.1] Use \c std::unique_ptr instead; this function may let a pointer + \deprecated [6.2] Use \c std::unique_ptr instead; this function may let a pointer escape its scope. Swap this pointer with \a other.