Doc: Use \deprecated instead of \obsolete

Task-number: QTBUG-93990
Change-Id: I931cb10e0f217b32687c4b18379b9fdac77bfee8
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

6 files changed, 43 insertions, 43 deletions

diff --git a/src/assistant/help/qhelpenginecore.cpp b/src/assistant/help/qhelpenginecore.cpp
index b5e1b9b9f..4dee74325 100644
--- a/src/assistant/help/qhelpenginecore.cpp
+++ b/src/assistant/help/qhelpenginecore.cpp
@@ -160,12 +160,12 @@ void QHelpEngineCorePrivate::errorReceived(const QString &msg)
 
 /*!
     \fn void QHelpEngineCore::readersAboutToBeInvalidated()
-    \obsolete
+    \deprecated
 */
 
 /*!
     \fn void QHelpEngineCore::currentFilterChanged(const QString &newFilter)
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::filterActivated() should be used instead.
 
@@ -401,7 +401,7 @@ QStringList QHelpEngineCore::registeredDocumentations() const
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::filters() should be used instead.
 
@@ -417,7 +417,7 @@ QStringList QHelpEngineCore::customFilters() const
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::setFilterData() should be used instead.
 
@@ -437,7 +437,7 @@ bool QHelpEngineCore::addCustomFilter(const QString &filterName,
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::removeFilter() should be used instead.
 
@@ -454,7 +454,7 @@ bool QHelpEngineCore::removeCustomFilter(const QString &filterName)
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::availableComponents() should be used instead.
 
@@ -468,7 +468,7 @@ QStringList QHelpEngineCore::filterAttributes() const
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::filterData() should be used instead.
 
@@ -483,7 +483,7 @@ QStringList QHelpEngineCore::filterAttributes(const QString &filterName) const
 }
 
 /*!
-    \obsolete
+    \deprecated
     \property QHelpEngineCore::currentFilter
     \brief the name of the custom filter currently applied.
     \since 4.5
@@ -525,7 +525,7 @@ void QHelpEngineCore::setCurrentFilter(const QString &filterName)
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     QHelpFilterEngine::filterData() should be used instead.
 
@@ -542,7 +542,7 @@ QList<QStringList> QHelpEngineCore::filterAttributeSets(const QString &namespace
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     files() should be used instead.
 
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index 96fea1433..eaaf44ed3 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -310,7 +310,7 @@ QModelIndex QHelpIndexModel::filter(const QString &filter, const QString &wildca
     \fn void QHelpIndexWidget::linkActivated(const QUrl &link,
         const QString &keyword)
 
-    \obsolete
+    \deprecated
 
     Use documentActivated() instead.
 
diff --git a/src/assistant/help/qhelpsearchengine.cpp b/src/assistant/help/qhelpsearchengine.cpp
index c3dcc4422..1053a9b6e 100644
--- a/src/assistant/help/qhelpsearchengine.cpp
+++ b/src/assistant/help/qhelpsearchengine.cpp
@@ -273,7 +273,7 @@ private:
 
 /*!
     \class QHelpSearchQuery
-    \obsolete
+    \deprecated
     \since 4.4
     \inmodule QtHelp
     \brief The QHelpSearchQuery class contains the field name and the associated
@@ -306,14 +306,14 @@ private:
 
     \value DEFAULT  the default field provided by the search widget, several terms should be
                     split and stored in the word list except search terms enclosed in quotes.
-    \value FUZZY    \obsolete Terms should be split in separate
+    \value FUZZY    \deprecated Terms should be split in separate
                     words and passed to the search engine.
-    \value WITHOUT  \obsolete  Terms should be split in separate
+    \value WITHOUT  \deprecated  Terms should be split in separate
                     words and passed to the search engine.
-    \value PHRASE   \obsolete  Terms should not be split in separate words.
-    \value ALL      \obsolete  Terms should be split in separate
+    \value PHRASE   \deprecated  Terms should not be split in separate words.
+    \value ALL      \deprecated  Terms should be split in separate
                     words and passed to the search engine
-    \value ATLEAST  \obsolete  Terms should be split in separate
+    \value ATLEAST  \deprecated  Terms should be split in separate
                     words and passed to the search engine
 */
 
@@ -434,7 +434,7 @@ QHelpSearchResultWidget* QHelpSearchEngine::resultWidget()
 }
 
 /*!
-    \obsolete
+    \deprecated
     Use searchResultCount() instead.
 */
 int QHelpSearchEngine::hitsCount() const
@@ -444,7 +444,7 @@ int QHelpSearchEngine::hitsCount() const
 
 /*!
     \since 4.6
-    \obsolete
+    \deprecated
     Use searchResultCount() instead.
 */
 int QHelpSearchEngine::hitCount() const
@@ -463,7 +463,7 @@ int QHelpSearchEngine::searchResultCount() const
 
 /*!
     \typedef QHelpSearchEngine::SearchHit
-    \obsolete
+    \deprecated
 
     Use QHelpSearchResult instead.
 
@@ -474,7 +474,7 @@ int QHelpSearchEngine::searchResultCount() const
 */
 
 /*!
-    \obsolete
+    \deprecated
     Use searchResults() instead.
 */
 QList<QHelpSearchEngine::SearchHit> QHelpSearchEngine::hits(int start, int end) const
@@ -505,7 +505,7 @@ QString QHelpSearchEngine::searchInput() const
 }
 
 /*!
-    \obsolete
+    \deprecated
     \since 4.5
     Use searchInput() instead.
 */
@@ -562,7 +562,7 @@ void QHelpSearchEngine::search(const QString &searchInput)
 }
 
 /*!
-    \obsolete
+    \deprecated
     Use search(const QString &searchInput) instead.
 */
 void QHelpSearchEngine::search(const QList<QHelpSearchQuery> &queryList)
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 183e317aa..8367eb983 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -295,7 +295,7 @@ void QHelpSearchQueryWidget::collapseExtendedSearch()
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     Use searchInput() instead.
 */
@@ -306,7 +306,7 @@ QList<QHelpSearchQuery> QHelpSearchQueryWidget::query() const
 }
 
 /*!
-    \obsolete
+    \deprecated
 
     Use setSearchInput() instead.
 */
diff --git a/src/assistant/qlitehtml b/src/assistant/qlitehtml
-Subproject 908670c5b68d3bcf4712019a028079b8b2042dd
+Subproject 0e4f53aea2eb449bcefba30a712e97dc3b0ab05
diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
index b94e04672..c85fb0fb3 100644
--- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
@@ -143,7 +143,7 @@ QDesignerFormWindowManagerInterface::~QDesignerFormWindowManagerInterface() = de
     returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -159,7 +159,7 @@ QAction *QDesignerFormWindowManagerInterface::actionCut() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -175,7 +175,7 @@ QAction *QDesignerFormWindowManagerInterface::actionCopy() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -191,7 +191,7 @@ QAction *QDesignerFormWindowManagerInterface::actionPaste() const
     returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -205,7 +205,7 @@ QAction *QDesignerFormWindowManagerInterface::actionDelete() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -220,7 +220,7 @@ QAction *QDesignerFormWindowManagerInterface::actionSelectAll() const
     action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -236,7 +236,7 @@ QAction *QDesignerFormWindowManagerInterface::actionLower() const
     action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -251,7 +251,7 @@ QAction *QDesignerFormWindowManagerInterface::actionRaise() const
     the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -266,7 +266,7 @@ QAction *QDesignerFormWindowManagerInterface::actionHorizontalLayout() const
     original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -280,7 +280,7 @@ QAction *QDesignerFormWindowManagerInterface::actionVerticalLayout() const
     action. The function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -294,7 +294,7 @@ QAction *QDesignerFormWindowManagerInterface::actionSplitHorizontal() const
     action. The function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -309,7 +309,7 @@ QAction *QDesignerFormWindowManagerInterface::actionSplitVertical() const
     original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -324,7 +324,7 @@ QAction *QDesignerFormWindowManagerInterface::actionGridLayout() const
 
     \sa QAction
     \since 4.4
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -339,7 +339,7 @@ QAction *QDesignerFormWindowManagerInterface::actionFormLayout() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -353,7 +353,7 @@ QAction *QDesignerFormWindowManagerInterface::actionBreakLayout() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -368,7 +368,7 @@ QAction *QDesignerFormWindowManagerInterface::actionAdjustSize() const
 
     \sa QAction
     \since 4.4
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -448,7 +448,7 @@ QAction *QDesignerFormWindowManagerInterface::actionSimplifyLayout() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */
@@ -462,7 +462,7 @@ QAction *QDesignerFormWindowManagerInterface::actionUndo() const
     function returns the original action.
 
     \sa QAction
-    \obsolete
+    \deprecated
 
     Use action() instead.
 */