6 files changed, 6 insertions, 22 deletions
diff --git a/examples/widgets/doc/src/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc
index b33fa3550f..f26424abaf 100644
--- a/examples/widgets/doc/src/stardelegate.qdoc
+++ b/examples/widgets/doc/src/stardelegate.qdoc
@@ -229,7 +229,7 @@
     We first set the pen and brush we will use for painting. The \c
     mode parameter can be either \c Editable or \c ReadOnly. If \c
     mode is editable, we use the \l{QPalette::}{Highlight} color
-    instead of the \l{QPalette::}{Foreground} color to draw the
+    instead of the \l{QPalette::}{WindowText} color to draw the
     stars.
 
     Then we draw the stars. If we are in \c Edit mode, we paint
diff --git a/examples/widgets/doc/src/styles.qdoc b/examples/widgets/doc/src/styles.qdoc
index 014541a330..99575a84da 100644
--- a/examples/widgets/doc/src/styles.qdoc
+++ b/examples/widgets/doc/src/styles.qdoc
@@ -123,7 +123,7 @@
     We initialize the palette. Palettes have various
     \l{QPalette::ColorRole}{color roles}, such as QPalette::Base
     (used for filling text editors, item views, etc.), QPalette::Text
-    (used for foreground text), and QPalette::Background (used for
+    (used for foreground text), and QPalette::Window (used for
     the background of most widgets). Each role has its own QBrush,
     which usually is a plain color but can also be a brush pattern or
     even a texture (a QPixmap).
@@ -266,7 +266,7 @@
 
     \list
     \li If the button is a \l{QPushButton::flat}{flat button}, we use
-       the \l{QPalette::Background}{Background} brush. We set \c
+       the \l{QPalette::Window}{Window} brush. We set \c
        darker to \c true if the button is
        \l{QAbstractButton::down}{down} or
        \l{QAbstractButton::checked}{checked}.
@@ -350,7 +350,7 @@
 
     The bottom-right part of the outline is drawn in a similar
     fashion. Then we draw a one-pixel wide outline around the entire
-    button, using the \l{QPalette::Foreground}{Foreground} component
+    button, using the \l{QPalette::WindowText}{WindowText} component
     of the QPalette.
 
     This completes the QStyle::PE_PanelButtonCommand case of the \c
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc
index eb72e1ed8e..30c5ec6493 100644
--- a/src/corelib/text/qlocale.qdoc
+++ b/src/corelib/text/qlocale.qdoc
@@ -183,7 +183,6 @@
     \value Duala
     \value Dutch
     \value Dzongkha
-    \value EasternKayah Obsolete, no locale data available
     \value Embu
     \value English
     \value Erzya Since Qt 5.14
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index f0290c1830..d1c49fc520 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -26,21 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \class QPair
-    \inmodule QtCore
-    \obsolete
-    \brief QPair is an alias for std::pair.
-
-    \ingroup tools
-
-    QPair\<T1, T2\> is a typedef for std::pair\<T1, T2\>.
-    It is provided for backwards compatibility. Use std::pair directly
-    instead.
-
-    \sa {Container Classes}
-*/
-
-/*!
     \typealias QPair
     \relates QPair
     \since 6.0
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index b8fc8e6821..695a46d050 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2652,7 +2652,7 @@ QFont::Style QFontInfo::style() const
     use the old scale. For convenience, this function may be used when
     porting from code which uses the old weight scale.
 
-    \sa setWeight(), weight(), QFontInfo
+    \sa QFont::setWeight(), weight(), QFontInfo
 */
 int QFontInfo::legacyWeight() const
 {
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index c037267f45..fbc616cc97 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -3717,7 +3717,7 @@ void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
     Initialize the \a option structure with the view's palette, font, state,
     alignments etc.
 
-    \note Implementations of this methods should check the \l{QStyleOption::}version
+    \note Implementations of this methods should check the \l{QStyleOption::}{version}
     of the structure received, populate all members the implementation is familiar with,
     and set the version member to the one supported by the implementation before returning.
 */