1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs: Fix QScoped(Array)Pointer::swap() deprecation version

Browse Source 
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 <thiago.macieira@intel.com>
(cherry picked from commit 65e9c215ff25f7b97520a2b502548c5f5af0e589)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-10-25 15:42:01 +02:00 committed by Qt Cherry-pick Bot
parent 6535b6d5f3
commit 0174df3a4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qscopedpointer.cpp
View File

@ -229,7 +229,7 @@ QT_BEGIN_NAMESPACE
/*! \fn template <typename T, typename Cleanup> void QScopedPointer<T, Cleanup>::swap(QScopedPointer<T, Cleanup> &lhs, QScopedPointer<T, Cleanup> &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 <typename T, typename Cleanup> void QScopedArrayPointer<T, Cleanup>::swap(QScopedArrayPointer<T, Cleanup> &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.