21 files changed, 82 insertions, 61 deletions
diff --git a/src/components/BackspaceKey.qml b/src/components/BackspaceKey.qml
index 998e9181..f9dcd7aa 100644
--- a/src/components/BackspaceKey.qml
+++ b/src/components/BackspaceKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype BackspaceKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Backspace key for keyboard layouts.
diff --git a/src/components/BaseKey.qml b/src/components/BaseKey.qml
index af2adee2..d7a61b9e 100644
--- a/src/components/BaseKey.qml
+++ b/src/components/BaseKey.qml
@@ -33,8 +33,9 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype BaseKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits Item
 
     \brief Common parent for all key types.
@@ -50,25 +51,10 @@ Item {
 
     /*! \since QtQuick.VirtualKeyboard 6.1
 
-        Type of the key.
-
-        \list
-            \li \c QtVirtualKeyboard.BaseKey
-            \li \c QtVirtualKeyboard.BackspaceKey
-            \li \c QtVirtualKeyboard.ChangeLanguageKey
-            \li \c QtVirtualKeyboard.EnterKey
-            \li \c QtVirtualKeyboard.FillerKey
-            \li \c QtVirtualKeyboard.HandwritingModeKey
-            \li \c QtVirtualKeyboard.HideKeyboardKey
-            \li \c QtVirtualKeyboard.InputModeKey
-            \li \c QtVirtualKeyboard.Key
-            \li \c QtVirtualKeyboard.ModeKey
-            \li \c QtVirtualKeyboard.NumberKey
-            \li \c QtVirtualKeyboard.ShiftKey
-            \li \c QtVirtualKeyboard.SpaceKey
-            \li \c QtVirtualKeyboard.SymbolModeKey
-            \li \c QtVirtualKeyboard.FlickKey
-        \endlist
+        \l Key type for the specialized key. Possible values are defined by the
+        {QtVirtualKeyboard::KeyType}{key type enumeration}.
+
+        For example, \l SpaceKey sets this value to \e QtVirtualKeyboard.SpaceKey.
     */
     property int keyType: QtVirtualKeyboard.BaseKey
 
diff --git a/src/components/ChangeLanguageKey.qml b/src/components/ChangeLanguageKey.qml
index 0d3ec969..2bae1bd2 100644
--- a/src/components/ChangeLanguageKey.qml
+++ b/src/components/ChangeLanguageKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype ChangeLanguageKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Change language key for keyboard layouts.
diff --git a/src/components/EnterKey.qml b/src/components/EnterKey.qml
index f3ade36e..73f00fad 100644
--- a/src/components/EnterKey.qml
+++ b/src/components/EnterKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype EnterKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Enter key for keyboard layouts.
diff --git a/src/components/FillerKey.qml b/src/components/FillerKey.qml
index a6c2a402..3f6f4d9f 100644
--- a/src/components/FillerKey.qml
+++ b/src/components/FillerKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype FillerKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Filler key for keyboard layouts.
diff --git a/src/components/FlickKey.qml b/src/components/FlickKey.qml
index 48108f00..11ad2ce2 100644
--- a/src/components/FlickKey.qml
+++ b/src/components/FlickKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype FlickKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
     \since QtQuick.VirtualKeyboard 6.1
 
diff --git a/src/components/HandwritingModeKey.qml b/src/components/HandwritingModeKey.qml
index 946b9502..ea6debeb 100644
--- a/src/components/HandwritingModeKey.qml
+++ b/src/components/HandwritingModeKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype HandwritingModeKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
     \since QtQuick.VirtualKeyboard 2.0
 
diff --git a/src/components/HideKeyboardKey.qml b/src/components/HideKeyboardKey.qml
index 504fbc3a..48ce9b94 100644
--- a/src/components/HideKeyboardKey.qml
+++ b/src/components/HideKeyboardKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype HideKeyboardKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Hide keyboard key for keyboard layouts.
diff --git a/src/components/InputModeKey.qml b/src/components/InputModeKey.qml
index 142c8866..de67cb32 100644
--- a/src/components/InputModeKey.qml
+++ b/src/components/InputModeKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype InputModeKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
     \since QtQuick.VirtualKeyboard 2.3
 
diff --git a/src/components/Key.qml b/src/components/Key.qml
index a1666f3a..4f08d4f6 100644
--- a/src/components/Key.qml
+++ b/src/components/Key.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype Key
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Regular character key for keyboard layouts.
diff --git a/src/components/KeyboardColumn.qml b/src/components/KeyboardColumn.qml
index 15c2e315..40b463a0 100644
--- a/src/components/KeyboardColumn.qml
+++ b/src/components/KeyboardColumn.qml
@@ -32,8 +32,9 @@ import QtQuick.Layouts
 
 /*!
     \qmltype KeyboardColumn
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits ColumnLayout
 
     \brief Keyboard column for keyboard layouts.
diff --git a/src/components/KeyboardLayout.qml b/src/components/KeyboardLayout.qml
index 14e5e8eb..25b8ff47 100644
--- a/src/components/KeyboardLayout.qml
+++ b/src/components/KeyboardLayout.qml
@@ -33,8 +33,9 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype KeyboardLayout
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits ColumnLayout
 
     \brief Keyboard layout.
diff --git a/src/components/KeyboardLayoutLoader.qml b/src/components/KeyboardLayoutLoader.qml
index f67a72e8..c381cd47 100644
--- a/src/components/KeyboardLayoutLoader.qml
+++ b/src/components/KeyboardLayoutLoader.qml
@@ -32,8 +32,9 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype KeyboardLayoutLoader
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits Loader
     \since QtQuick.VirtualKeyboard 1.1
 
diff --git a/src/components/KeyboardRow.qml b/src/components/KeyboardRow.qml
index d08f8411..b83b45c6 100644
--- a/src/components/KeyboardRow.qml
+++ b/src/components/KeyboardRow.qml
@@ -32,8 +32,9 @@ import QtQuick.Layouts
 
 /*!
     \qmltype KeyboardRow
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits RowLayout
 
     \brief Keyboard row for keyboard layouts.
diff --git a/src/components/ModeKey.qml b/src/components/ModeKey.qml
index 165d0f95..b746170b 100644
--- a/src/components/ModeKey.qml
+++ b/src/components/ModeKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype ModeKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
     \since QtQuick.VirtualKeyboard 2.0
 
diff --git a/src/components/NumberKey.qml b/src/components/NumberKey.qml
index 61df72aa..995b664c 100644
--- a/src/components/NumberKey.qml
+++ b/src/components/NumberKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype NumberKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
 
     \brief Specialized number key for keyboard layouts.
diff --git a/src/components/ShiftKey.qml b/src/components/ShiftKey.qml
index 1b256c66..d06a5910 100644
--- a/src/components/ShiftKey.qml
+++ b/src/components/ShiftKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype ShiftKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits BaseKey
 
     \brief Shift key for keyboard layouts.
diff --git a/src/components/SpaceKey.qml b/src/components/SpaceKey.qml
index 0a06ad29..a3a99ceb 100644
--- a/src/components/SpaceKey.qml
+++ b/src/components/SpaceKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype SpaceKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
 
     \brief Space key for keyboard layouts.
diff --git a/src/components/SymbolModeKey.qml b/src/components/SymbolModeKey.qml
index d58402cb..c9089a11 100644
--- a/src/components/SymbolModeKey.qml
+++ b/src/components/SymbolModeKey.qml
@@ -32,8 +32,10 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype SymbolModeKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Key
 
     \brief Symbol mode key for keyboard layouts.
diff --git a/src/components/TraceInputArea.qml b/src/components/TraceInputArea.qml
index cbbfc598..f692503f 100644
--- a/src/components/TraceInputArea.qml
+++ b/src/components/TraceInputArea.qml
@@ -33,8 +33,9 @@ import QtQuick.VirtualKeyboard
 
 /*!
     \qmltype TraceInputArea
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
     \inherits MultiPointTouchArea
     \since QtQuick.VirtualKeyboard 2.0
 
diff --git a/src/components/TraceInputKey.qml b/src/components/TraceInputKey.qml
index a12a0a20..9ee9dce8 100644
--- a/src/components/TraceInputKey.qml
+++ b/src/components/TraceInputKey.qml
@@ -32,8 +32,10 @@ import QtQuick.Layouts
 
 /*!
     \qmltype TraceInputKey
-    \inqmlmodule QtQuick.VirtualKeyboard
-    \ingroup qtvirtualkeyboard-qml
+    \inqmlmodule QtQuick.VirtualKeyboard.Components
+    \ingroup qmlclass
+    \ingroup qtvirtualkeyboard-components-qml
+    \ingroup qtvirtualkeyboard-key-types
     \inherits Item
     \since QtQuick.VirtualKeyboard 2.0