7 files changed, 15 insertions, 15 deletions
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index dcb90a530d..743093bc4e 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -878,7 +878,7 @@ void QHashSeed::resetRandomGlobalSeed()
 #if QT_DEPRECATED_SINCE(6,6)
 /*! \relates QHash
     \since 5.6
-    \obsolete Use QHashSeed::globalSeed() instead.
+    \deprecated Use QHashSeed::globalSeed() instead.
 
     Returns the current global QHash seed.
 
@@ -894,7 +894,7 @@ int qGlobalQHashSeed()
 
 /*! \relates QHash
     \since 5.6
-    \obsolete Use QHashSeed instead.
+    \deprecated Use QHashSeed instead.
 
     Sets the global QHash seed to \a newSeed.
 
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index f90dc1785a..bbedfa948e 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -366,7 +366,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
 /*!
     \typealias QLineF::IntersectType
-    \obsolete Use QLineF::IntersectionType instead.
+    \deprecated Use QLineF::IntersectionType instead.
 */
 
 /*!
diff --git a/src/corelib/tools/qlist.qdoc b/src/corelib/tools/qlist.qdoc
index 2fcc088f0a..88c8ca3dc5 100644
--- a/src/corelib/tools/qlist.qdoc
+++ b/src/corelib/tools/qlist.qdoc
@@ -1509,7 +1509,7 @@
 
 /*! \fn template <typename T> QList<T> QList<T>::toList() const
     \fn template <typename T> QList<T> QList<T>::toVector() const
-    \obsolete
+    \deprecated
 
     A no-op in Qt 6. Provided for backwards compatibility with
     Qt 5, where QList and QVector where two different types.
@@ -1519,7 +1519,7 @@
 
 /*! \fn template <typename T> QList<T> QList<T>::fromList(const QList<T> &list)
     \fn template <typename T> QList<T> QList<T>::fromVector(const QList<T> &list)
-    \obsolete
+    \deprecated
 
     A no-op in Qt 6. Provided for backwards compatibility with
     Qt 5, where QList and QVector were two different types.
diff --git a/src/corelib/tools/qmultimap.qdoc b/src/corelib/tools/qmultimap.qdoc
index d3af4e7973..a57708b261 100644
--- a/src/corelib/tools/qmultimap.qdoc
+++ b/src/corelib/tools/qmultimap.qdoc
@@ -241,7 +241,7 @@
 */
 
 /*! \fn template <class Key, class T> std::multimap<Key, T> QMultiMap<Key, T>::toStdMap() const
-    \obsolete Use toStdMultiMap() instead.
+    \deprecated Use toStdMultiMap() instead.
 
     Returns an STL multi map equivalent to this QMultiMap.
 */
@@ -858,13 +858,13 @@
 
 #if QT_DEPRECATED_SINCE(6, 0)
 /*! \fn template <class Key, class T> QMultiMap<Key, T>::iterator QMultiMap<Key, T>::insertMulti(const Key &key, const T &value)
-    \obsolete Use insert() instead.
+    \deprecated Use insert() instead.
 
     Inserts a new item with the key \a key and a value of \a value, and returns an iterator pointing to the new item.
 */
 
 /*! \fn template <class Key, class T> QMultiMap<Key, T>::iterator QMultiMap<Key, T>::insertMulti(const_iterator pos, const Key &key, const T &value)
-    \obsolete Use insert() instead.
+    \deprecated Use insert() instead.
     \overload
 
     Inserts a new item with the key \a key and value \a value and with hint \a pos
@@ -873,14 +873,14 @@
 
 /*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(const QMultiMap<Key, T> &map)
     \since 5.15
-    \obsolete Use unite() instead.
+    \deprecated Use unite() instead.
 
     Inserts all the items in \a map into this map.
 */
 
 /*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(QMultiMap<Key, T> &&map)
     \since 5.15
-    \obsolete Use unite() instead.
+    \deprecated Use unite() instead.
     \overload
 
     Moves all the items from \a map into this map.
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index d1c49fc520..3cd1beec18 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -34,7 +34,7 @@
 
 /*!
     \fn template <class T1, class T2> QPair<T1, T2> qMakePair(T1 &&value1, T2 &&value2)
-    \obsolete
+    \deprecated
     \relates QPair
 
     qMakePair forwards its arguments to std::make_pair, and returns
diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp
index 40d08b9653..8146fe33cf 100644
--- a/src/corelib/tools/qscopedpointer.cpp
+++ b/src/corelib/tools/qscopedpointer.cpp
@@ -248,7 +248,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn template <typename T, typename Cleanup> T *QScopedPointer<T, Cleanup>::take()
 
-    \obsolete Use std::unique_ptr and release() instead.
+    \deprecated Use std::unique_ptr and release() instead.
 
     Returns the value of the pointer referenced by this object. The pointer of this
     QScopedPointer object will be reset to \nullptr.
@@ -265,7 +265,7 @@ QT_BEGIN_NAMESPACE
 
 /*! \fn template <typename T, typename Cleanup> void QScopedPointer<T, Cleanup>::swap(QScopedPointer<T, Cleanup> &lhs, QScopedPointer<T, Cleanup> &rhs)
 
-    \obsolete Use std::unique_ptr instead; this function may let a pointer
+    \deprecated Use std::unique_ptr instead; this function may let a pointer
     escape its scope.
 
     Swaps \a lhs with \a rhs.
@@ -335,7 +335,7 @@ QT_BEGIN_NAMESPACE
 
 /*! \fn template <typename T, typename Cleanup> void QScopedArrayPointer<T, Cleanup>::swap(QScopedArrayPointer<T, Cleanup> &other)
 
-    \obsolete Use std::unique_ptr instead; this function may let a pointer
+    \deprecated Use std::unique_ptr instead; this function may let a pointer
     escape its scope.
 
     Swap this pointer with \a other.
diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp
index ef921a8284..bd4d6c906b 100644
--- a/src/corelib/tools/qsharedpointer.cpp
+++ b/src/corelib/tools/qsharedpointer.cpp
@@ -848,7 +848,7 @@
 /*!
     \fn template <class T> T *QWeakPointer<T>::data() const
     \since 4.6
-    \obsolete Use toStrongRef() instead, and data() on the returned QSharedPointer.
+    \deprecated Use toStrongRef() instead, and data() on the returned QSharedPointer.
 
     Returns the value of the pointer being tracked by this QWeakPointer,
     \b without ensuring that it cannot get deleted. To have that guarantee,