diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2021-05-25 15:04:48 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2021-05-26 13:06:56 +0200 |
| commit | a1dfe27955ab2da27551d19500c2d2a01d46e470 (patch) | |
| tree | e1ebc6b2f9a255f5b0c3f2df0833f2f6f431fe74 /src/corelib/global | |
| parent | ae021882330abc5f6fbaadca290e6e5670c89028 (diff) | |
Doc: Use \deprecated instead of \obsolete
Task-number: QTBUG-93990
Change-Id: I4e512354a49dde6678ca89cabc56bc76ba666bb3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 56246783ed..94050d5595 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -4745,7 +4745,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) /*! \macro qMove(x) \relates <QtGlobal> - \obsolete + \deprecated Use \c std::move instead. @@ -4850,7 +4850,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) /*! \macro Q_DECL_OVERRIDE \since 5.0 - \obsolete + \deprecated \relates <QtGlobal> This macro can be used to declare an overriding virtual @@ -4870,7 +4870,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters) /*! \macro Q_DECL_FINAL \since 5.0 - \obsolete + \deprecated \relates <QtGlobal> This macro can be used to declare an overriding virtual or a class diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index fccefa8008..740e32635f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -531,7 +531,7 @@ void QLibraryInfoPrivate::keyAndDefault(QLibraryInfo::LibraryPath loc, QString * } /*! \fn QString QLibraryInfo::location(LibraryLocation loc) - \obsolete Use path() instead. + \deprecated Use path() instead. Returns the path specified by \a loc. \sa path() @@ -678,7 +678,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) /*! \typealias QLibraryInfo::LibraryLocation - \obsolete Use LibraryPath with QLibraryInfo::path() instead. + \deprecated Use LibraryPath with QLibraryInfo::path() instead. */ QT_END_NAMESPACE diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 1452c8eea8..be91d5f12d 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -3376,7 +3376,7 @@ #if QT_DEPRECATED_SINCE(6, 0) /*! \fn QKeyCombination::operator int() const noexcept - \obsolete + \deprecated Use toCombined() instead. */ @@ -3427,7 +3427,7 @@ \fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifier modifier) noexcept \relates QKeyCombination - \obsolete + \deprecated Use operator| instead. @@ -3442,7 +3442,7 @@ \fn QKeyCombination operator+(Qt::Key key, Qt::KeyboardModifiers modifiers) noexcept \relates QKeyCombination - \obsolete + \deprecated Use operator| instead. |