StyleKit: rename AbstractStylableControls to StylableControls

The type is uncreatable and exists only to hold the grouped
properties for each stylable control type (button, slider,
checkBox, etc.), so its name is never written in QML. The only
place users see it is in the documentation, where it is linked
heavily from Style, StyleReader, StyleVariation and the overview
pages.

In that context the "Abstract" prefix adds nothing but noise:
the \brief and the type description already say that it's an
abstract base type. Drop the prefix so that the doc links read
better.

This is a pure rename of the QML element name and the
corresponding doc references. No functional change.

Change-Id: I352c28f4fca42db81dfc513c14ac4c7cca691dfe
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 855317a7420c7cd33a2a253c4f351642b9b6e9b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

13 files changed, 120 insertions, 120 deletions

diff --git a/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc b/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc
index e7b6d82073..2aa2217237 100644
--- a/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc
+++ b/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc
@@ -19,7 +19,7 @@
     \l {DelegateStyle::shadow}{shadows}.
 
     A key strength of StyleKit is its hierarchical property system: set a property once
-    on a base type like \l {AbstractStylableControls::}{abstractButton}, and it
+    on a base type like \l {StylableControls::}{abstractButton}, and it
     automatically applies to all button-like controls.
     Override it where needed for specific controls or states. Changes to your
     style are instantly reflected across all controls, ensuring consistency while still
diff --git a/src/labs/stylekit/doc/src/qtlabsstylekit-overview.qdoc b/src/labs/stylekit/doc/src/qtlabsstylekit-overview.qdoc
index 2e334fb3a6..7b8ed25851 100644
--- a/src/labs/stylekit/doc/src/qtlabsstylekit-overview.qdoc
+++ b/src/labs/stylekit/doc/src/qtlabsstylekit-overview.qdoc
@@ -13,12 +13,12 @@
     \section1 Creating a Style
 
     A \l Style is a QML object that describes the visual appearance of all
-    \l {Qt Quick Controls} in your application — \l {AbstractStylableControls::}{button},
-    \l {AbstractStylableControls::}{slider}, \l {AbstractStylableControls::}{checkBox}, and
+    \l {Qt Quick Controls} in your application — \l {StylableControls::}{button},
+    \l {StylableControls::}{slider}, \l {StylableControls::}{checkBox}, and
     so on. Each has its own group in the style where you can set properties such as
     colors, sizes, radii, and shadows for the visual parts that make up the control.
 
-    The \l {AbstractStylableControls::control}{control group} is special, since it acts as
+    The \l {StylableControls::control}{control group} is special, since it acts as
     a fallback for all the other control groups. If you leave out some of the properties
     for a \c slider, for example, they will be read from \c control instead.
     Properties not set in \c slider or \c control fall back further to the
@@ -132,14 +132,14 @@
     If your application includes custom controls that are not part of
     \l {Qt Quick Controls}, you can still integrate them with \c StyleKit.
     Just add a \l CustomControl for each of them and style them the same
-    way you style the \l {AbstractStylableControls}{built-in controls}:
+    way you style the \l {StylableControls}{built-in controls}:
 
     \snippet CustomControlSnippets.qml custom control style
 
     In the control's implementation, use a \l StyleReader with the matching
     \l {StyleReader::controlType}{controlType} to read back the style properties.
     The correct property values are resolved by taking \l {Theme}{Themes},
-    \l {StyleVariation}{StyleVariations}, \l {AbstractStylableControls}{fallback types},
+    \l {StyleVariation}{StyleVariations}, \l {StylableControls}{fallback types},
     and property propagation into account.
     For a style reader to do this, it needs to know the state of your control.
     Therefore bind your control's state to the relevant \l StyleReader
diff --git a/src/labs/stylekit/doc/src/qtlabsstylekit-propagation.qdoc b/src/labs/stylekit/doc/src/qtlabsstylekit-propagation.qdoc
index a36d2268d2..8241dc274e 100644
--- a/src/labs/stylekit/doc/src/qtlabsstylekit-propagation.qdoc
+++ b/src/labs/stylekit/doc/src/qtlabsstylekit-propagation.qdoc
@@ -47,15 +47,15 @@
 
     \section1 Control Type Hierarchy
 
-    \l {AbstractStylableControls}{The controls} form a hierarchy. A \l {AbstractStylableControls::button}{button}
-    falls back to \l {AbstractStylableControls::abstractButton}{abstractButton}, which
-    falls back to \l {AbstractStylableControls::control}{control}.
-    A \l {AbstractStylableControls::groupBox}{groupBox} falls back to
-    \l {AbstractStylableControls::frame}{frame}, which falls back to
-    \l {AbstractStylableControls::pane}{pane}, which falls back to
-    \l {AbstractStylableControls::control}{control}, and so on.
+    \l {StylableControls}{The controls} form a hierarchy. A \l {StylableControls::button}{button}
+    falls back to \l {StylableControls::abstractButton}{abstractButton}, which
+    falls back to \l {StylableControls::control}{control}.
+    A \l {StylableControls::groupBox}{groupBox} falls back to
+    \l {StylableControls::frame}{frame}, which falls back to
+    \l {StylableControls::pane}{pane}, which falls back to
+    \l {StylableControls::control}{control}, and so on.
     \c control is the root type in the hierarchy, mirroring the type
-    hierarchy of \l {Qt Quick Controls}. Refer to the \l {AbstractStylableControls}{documentation}
+    hierarchy of \l {Qt Quick Controls}. Refer to the \l {StylableControls}{documentation}
     for each control type to see its direct fallback type.
 
     When all states and fallback properties have been exhausted for a specific control type,
diff --git a/src/labs/stylekit/qqstylekitcontrol.cpp b/src/labs/stylekit/qqstylekitcontrol.cpp
index f0d482c6e6..91b1dfba58 100644
--- a/src/labs/stylekit/qqstylekitcontrol.cpp
+++ b/src/labs/stylekit/qqstylekitcontrol.cpp
@@ -32,14 +32,14 @@ QT_BEGIN_NAMESPACE
     overrides are set through nested states, such as \l {ControlStateStyle::}{hovered}
     \l {ControlStateStyle::}{pressed}, and \l {ControlStateStyle::}{checked}.
 
-    \l {AbstractStylableControls}{Each stylable control} in a \l Style, \l Theme, or \l StyleVariation is a ControlStyle.
-    For example, in the snippet below, \l {AbstractStylableControls::}{control},
-    \l {AbstractStylableControls::}{button} and \l {AbstractStylableControls::}{radioButton}
+    \l {StylableControls}{Each stylable control} in a \l Style, \l Theme, or \l StyleVariation is a ControlStyle.
+    For example, in the snippet below, \l {StylableControls::}{control},
+    \l {StylableControls::}{button} and \l {StylableControls::}{radioButton}
     are all ControlStyles:
 
     \snippet ControlStyleSnippets.qml ControlStyle
 
-    \sa {AbstractStylableControls}{All stylable controls}, Style, Theme,
+    \sa {StylableControls}{All stylable controls}, Style, Theme,
         StyleVariation, ControlStateStyle, DelegateStyle
 */
 
diff --git a/src/labs/stylekit/qqstylekitcontrolproperties.cpp b/src/labs/stylekit/qqstylekitcontrolproperties.cpp
index 2ef9f69a3b..7b6bc69dee 100644
--- a/src/labs/stylekit/qqstylekitcontrolproperties.cpp
+++ b/src/labs/stylekit/qqstylekitcontrolproperties.cpp
@@ -74,9 +74,9 @@ QT_BEGIN_NAMESPACE
     \qmlproperty IndicatorStyle ControlStyleProperties::indicator
 
     Grouped property for styling the indicator of a control. For a
-    \l {AbstractStylableControls::}{checkBox}, the indicator is the
+    \l {StylableControls::}{checkBox}, the indicator is the
     frame, and its \l {IndicatorStyle::}{foreground} is the check mark.
-    For a \l {AbstractStylableControls::}{slider}, the indicator is
+    For a \l {StylableControls::}{slider}, the indicator is
     the groove, and the foreground is the fill.
 
     \sa DelegateStyle
@@ -759,9 +759,9 @@ QT_BEGIN_NAMESPACE
     \l foreground describes the content drawn inside it. For example,
     \c {checkBox.indicator} styles the check box frame and
     \c {checkBox.indicator.foreground} styles the check mark. For
-    \l {AbstractStylableControls::}{switchControl},
-    \l {AbstractStylableControls::}{slider} and
-    \l {AbstractStylableControls::}{progressBar}, the indicator styles
+    \l {StylableControls::}{switchControl},
+    \l {StylableControls::}{slider} and
+    \l {StylableControls::}{progressBar}, the indicator styles
     the groove and the foreground styles the fill.
 
     \snippet DelegateStyle_indicator.qml checkBox
@@ -796,9 +796,9 @@ QT_BEGIN_NAMESPACE
     indicator. For example, \c {checkBox.indicator} describes
     the check box frame, while \c {checkBox.indicator.foreground} is the check mark.
 
-    For controls like \l {AbstractStylableControls::}{slider},
-    \l {AbstractStylableControls::}{progressBar}, and
-    \l {AbstractStylableControls::}{switchControl}, the \c {indicator.foreground}
+    For controls like \l {StylableControls::}{slider},
+    \l {StylableControls::}{progressBar}, and
+    \l {StylableControls::}{switchControl}, the \c {indicator.foreground}
     represents the progress track or fill within the groove, while the \c indicator
     itself represents the groove.
 */
diff --git a/src/labs/stylekit/qqstylekitcontrols.cpp b/src/labs/stylekit/qqstylekitcontrols.cpp
index 283fbf1ba7..67081951d5 100644
--- a/src/labs/stylekit/qqstylekitcontrols.cpp
+++ b/src/labs/stylekit/qqstylekitcontrols.cpp
@@ -8,11 +8,11 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmltype AbstractStylableControls
+    \qmltype StylableControls
     \inqmlmodule Qt.labs.StyleKit
     \brief Abstract base type containing the control types that can be styled.
 
-    AbstractControls is an abstract base type. It contains a \l ControlStyle for
+    StylableControls is an abstract base type. It contains a \l ControlStyle for
     each control type that can be styled by a \l Style, \l Theme, or \l StyleVariation.
 
     The control types form a hierarchy where properties set on a base type
@@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::control
+    \qmlproperty ControlStyle StylableControls::control
 
     Grouped property for styling all controls.
 
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::abstractButton
+    \qmlproperty ControlStyle StylableControls::abstractButton
 
     Grouped property for styling all button-like controls, including
     \l [QtQuickControls]{Button}, \l [QtQuickControls]{CheckBox},
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::applicationWindow
+    \qmlproperty ControlStyle StylableControls::applicationWindow
 
     Grouped property for styling \l [QtQuickControls] ApplicationWindow.
 
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::busyIndicator
+    \qmlproperty ControlStyle StylableControls::busyIndicator
 
     Grouped property for styling \l [QtQuickControls]{BusyIndicator}.
 
@@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::button
+    \qmlproperty ControlStyle StylableControls::button
 
     Grouped property for styling \l [QtQuickControls]{Button}.
 
@@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::checkBox
+    \qmlproperty ControlStyle StylableControls::checkBox
 
     Grouped property for styling \l [QtQuickControls]{CheckBox}.
 
@@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::checkDelegate
+    \qmlproperty ControlStyle StylableControls::checkDelegate
 
     Grouped property for styling \l [QtQuickControls]{CheckDelegate}.
 
@@ -130,7 +130,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::comboBox
+    \qmlproperty ControlStyle StylableControls::comboBox
 
     Grouped property for styling \l [QtQuickControls]{ComboBox}.
 
@@ -142,7 +142,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::delayButton
+    \qmlproperty ControlStyle StylableControls::delayButton
 
     Grouped property for styling \l [QtQuickControls]{DelayButton}.
 
@@ -156,7 +156,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::dial
+    \qmlproperty ControlStyle StylableControls::dial
 
     Grouped property for styling \l [QtQuickControls]{Dial}.
 
@@ -166,7 +166,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::dialog
+    \qmlproperty ControlStyle StylableControls::dialog
 
     Grouped property for styling \l [QtQuickControls]{Dialog}.
 
@@ -176,7 +176,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::dialogButtonBox
+    \qmlproperty ControlStyle StylableControls::dialogButtonBox
 
     Grouped property for styling \l [QtQuickControls]{DialogButtonBox}.
 
@@ -186,7 +186,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::flatButton
+    \qmlproperty ControlStyle StylableControls::flatButton
 
     Grouped property for styling flat buttons (buttons with no visible
     background in their normal state). The styling will take effect for
@@ -198,7 +198,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::frame
+    \qmlproperty ControlStyle StylableControls::frame
 
     Grouped property for styling \l [QtQuickControls]{Frame}.
 
@@ -208,7 +208,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::groupBox
+    \qmlproperty ControlStyle StylableControls::groupBox
 
     Grouped property for styling \l [QtQuickControls]{GroupBox}.
 
@@ -218,7 +218,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::itemDelegate
+    \qmlproperty ControlStyle StylableControls::itemDelegate
 
     Grouped property for styling \l [QtQuickControls]{ItemDelegate}.
 
@@ -233,7 +233,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::label
+    \qmlproperty ControlStyle StylableControls::label
 
     Grouped property for styling \l [QtQuickControls]{Label}.
 
@@ -243,7 +243,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::menu
+    \qmlproperty ControlStyle StylableControls::menu
 
     Grouped property for styling \l [QtQuickControls]{Menu}.
 
@@ -253,7 +253,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::menuItem
+    \qmlproperty ControlStyle StylableControls::menuItem
 
     Grouped property for styling \l [QtQuickControls]{MenuItem}.
 
@@ -269,7 +269,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::menuBar
+    \qmlproperty ControlStyle StylableControls::menuBar
 
     Grouped property for styling \l [QtQuickControls]{MenuBar}.
 
@@ -285,7 +285,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::menuBarItem
+    \qmlproperty ControlStyle StylableControls::menuBarItem
 
     Grouped property for styling menu items in a \l [QtQuickControls]{MenuBar}.
 
@@ -301,7 +301,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::menuSeparator
+    \qmlproperty ControlStyle StylableControls::menuSeparator
 
     Grouped property for styling \l [QtQuickControls]{MenuSeparator}.
 
@@ -311,7 +311,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::page
+    \qmlproperty ControlStyle StylableControls::page
 
     Grouped property for styling \l [QtQuickControls]{Page}.
 
@@ -328,7 +328,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::pageIndicator
+    \qmlproperty ControlStyle StylableControls::pageIndicator
 
     Grouped property for styling \l [QtQuickControls]{PageIndicator}.
 
@@ -338,7 +338,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::pane
+    \qmlproperty ControlStyle StylableControls::pane
 
     Grouped property for styling \l [QtQuickControls]{Pane}.
 
@@ -348,7 +348,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::popup
+    \qmlproperty ControlStyle StylableControls::popup
 
     Grouped property for styling \l [QtQuickControls]{Popup}.
 
@@ -358,7 +358,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::progressBar
+    \qmlproperty ControlStyle StylableControls::progressBar
 
     Grouped property for styling \l [QtQuickControls]{ProgressBar}.
     For a progress bar, the groove is styled through the indicator, while the progress
@@ -376,7 +376,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::radioButton
+    \qmlproperty ControlStyle StylableControls::radioButton
 
     Grouped property for styling \l [QtQuickControls]{RadioButton}.
 
@@ -386,7 +386,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::radioDelegate
+    \qmlproperty ControlStyle StylableControls::radioDelegate
 
     Grouped property for styling \l [QtQuickControls]{RadioDelegate}.
 
@@ -396,7 +396,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::roundButton
+    \qmlproperty ControlStyle StylableControls::roundButton
 
     Grouped property for styling \l [QtQuickControls]{RoundButton}.
 
@@ -406,7 +406,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::scrollBar
+    \qmlproperty ControlStyle StylableControls::scrollBar
 
     Grouped property for styling \l [QtQuickControls]{ScrollBar}.
     The groove is styled through \l {ControlStyleProperties::}{background}, and the
@@ -418,7 +418,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::scrollIndicator
+    \qmlproperty ControlStyle StylableControls::scrollIndicator
 
     Grouped property for styling \l [QtQuickControls]{ScrollIndicator}.
     The groove is styled through \l {ControlStyleProperties::}{background}, and the
@@ -430,7 +430,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::scrollView
+    \qmlproperty ControlStyle StylableControls::scrollView
 
     Grouped property for styling \l [QtQuickControls]{ScrollView}.
 
@@ -445,7 +445,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::searchField
+    \qmlproperty ControlStyle StylableControls::searchField
 
     Grouped property for styling \l [QtQuickControls]{SearchField}.
 
@@ -456,7 +456,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::slider
+    \qmlproperty ControlStyle StylableControls::slider
 
     Grouped property for styling \l [QtQuickControls]{Slider}.
     For a slider, the groove is styled through the indicator, while the progress
@@ -472,7 +472,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::spinBox
+    \qmlproperty ControlStyle StylableControls::spinBox
 
     Grouped property for styling \l [QtQuickControls]{SpinBox}.
 
@@ -485,7 +485,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::swipeDelegate
+    \qmlproperty ControlStyle StylableControls::swipeDelegate
 
     Grouped property for styling \l [QtQuickControls]{SwipeDelegate}.
 
@@ -495,7 +495,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::switchControl
+    \qmlproperty ControlStyle StylableControls::switchControl
 
     Grouped property for styling \l [QtQuickControls]{Switch}.
 
@@ -505,7 +505,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::switchDelegate
+    \qmlproperty ControlStyle StylableControls::switchDelegate
 
     Grouped property for styling \l [QtQuickControls]{SwitchDelegate}.
 
@@ -515,7 +515,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::tabBar
+    \qmlproperty ControlStyle StylableControls::tabBar
 
     Grouped property for styling \l [QtQuickControls]{TabBar}.
 
@@ -525,7 +525,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::tabButton
+    \qmlproperty ControlStyle StylableControls::tabButton
 
     Grouped property for styling \l [QtQuickControls]{TabButton}.
 
@@ -535,7 +535,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::textArea
+    \qmlproperty ControlStyle StylableControls::textArea
 
     Grouped property for styling \l [QtQuickControls]{TextArea}.
 
@@ -545,7 +545,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::textField
+    \qmlproperty ControlStyle StylableControls::textField
 
     Grouped property for styling \l [QtQuickControls]{TextField}.
 
@@ -555,7 +555,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::textInput
+    \qmlproperty ControlStyle StylableControls::textInput
 
     Grouped property for styling all text input controls, including
     \l [QtQuickControls]{TextField} and \l [QtQuickControls]{TextArea}.
@@ -566,7 +566,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::toolBar
+    \qmlproperty ControlStyle StylableControls::toolBar
 
     Grouped property for styling \l [QtQuickControls]{ToolBar}.
 
@@ -576,7 +576,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::toolButton
+    \qmlproperty ControlStyle StylableControls::toolButton
 
     Grouped property for styling \l [QtQuickControls]{ToolButton}.
 
@@ -586,7 +586,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlproperty ControlStyle AbstractStylableControls::toolSeparator
+    \qmlproperty ControlStyle StylableControls::toolSeparator
 
     Grouped property for styling \l [QtQuickControls]{ToolSeparator}.
 
@@ -617,7 +617,7 @@ const QList<QObject *> QQStyleKitControls::children() const
 }
 
 /*!
-    \qmlmethod ControlStyle AbstractStylableControls::getControlStyle(controlType)
+    \qmlmethod ControlStyle StylableControls::getControlStyle(controlType)
 
     Returns the \l ControlStyle for the given \a controlType, or \c null, if
     no \l ControlStyle for the type has been defined.
diff --git a/src/labs/stylekit/qqstylekitcontrols_p.h b/src/labs/stylekit/qqstylekitcontrols_p.h
index 747021ae23..792b4f4338 100644
--- a/src/labs/stylekit/qqstylekitcontrols_p.h
+++ b/src/labs/stylekit/qqstylekitcontrols_p.h
@@ -79,7 +79,7 @@ class QQStyleKitControls : public QObject, public QQmlParserStatus
     Q_PROPERTY(QQStyleKitControl *menuItem READ menuItem WRITE set_menuItem NOTIFY menuItemChanged FINAL)
     Q_PROPERTY(QQStyleKitControl *menuSeparator READ menuSeparator WRITE set_menuSeparator NOTIFY menuSeparatorChanged FINAL)
     QML_UNCREATABLE("This component is abstract, and cannot be instantiated")
-    QML_NAMED_ELEMENT(AbstractStylableControls)
+    QML_NAMED_ELEMENT(StylableControls)
 
     Q_PROPERTY(QQmlListProperty<QObject> data READ data NOTIFY dataChanged FINAL)
     Q_CLASSINFO("DefaultProperty", "data")
diff --git a/src/labs/stylekit/qqstylekitcustomcontrol.cpp b/src/labs/stylekit/qqstylekitcustomcontrol.cpp
index 0b905d9040..13180c399e 100644
--- a/src/labs/stylekit/qqstylekitcustomcontrol.cpp
+++ b/src/labs/stylekit/qqstylekitcustomcontrol.cpp
@@ -16,20 +16,20 @@ QT_BEGIN_NAMESPACE
     or components that should be styled according to the active \l Style and \l Theme.
 
     Like the built-in control types (such as
-    \l {AbstractStylableControls::}{abstractButton},
-    \l {AbstractStylableControls::}{pane}, and
-    \l {AbstractStylableControls::}{slider}), CustomControl inherits
+    \l {StylableControls::}{abstractButton},
+    \l {StylableControls::}{pane}, and
+    \l {StylableControls::}{slider}), CustomControl inherits
     \l ControlStyle. Unlike built-in types, which are implicitly connected to
     their control type, a CustomControl requires \l controlType to be set
     explicitly. Apart from that, they work exactly the same way.
 
     A \l Style or \l Theme can define as many custom controls as needed, and a
     CustomControl in a Theme can have the same \l controlType as one in the \l Style.
-    That is no different from, for example, a \l {AbstractStylableControls::}{slider}
+    That is no different from, for example, a \l {StylableControls::}{slider}
     being styled by both the \l Style and the \l Theme. The fallback logic is the same.
 
     Any style properties not set on a CustomControl fall back to those set
-    on a \l {AbstractStylableControls::}{control}.
+    on a \l {StylableControls::}{control}.
 
     The following snippet shows how to define styling for a custom control:
 
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
 
     \labs
 
-    \sa StyleReader, ControlStyle, Style, AbstractStylableControls::getControlStyle()
+    \sa StyleReader, ControlStyle, Style, StylableControls::getControlStyle()
 */
 
 /*!
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
     Custom control types must be in the range \c 0 to \c 100000.
 
-    \sa {StyleReader::controlType}{StyleReader.controlType}, AbstractStylableControls::getControlStyle()
+    \sa {StyleReader::controlType}{StyleReader.controlType}, StylableControls::getControlStyle()
 */
 
 using namespace Qt::StringLiterals;
diff --git a/src/labs/stylekit/qqstylekitreader.cpp b/src/labs/stylekit/qqstylekitreader.cpp
index 4894d731bf..e691d07308 100644
--- a/src/labs/stylekit/qqstylekitreader.cpp
+++ b/src/labs/stylekit/qqstylekitreader.cpp
@@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE
     \l highlighted, etc. — tell StyleReader which state the control is in.
     It uses these to resolve and read the correct property values from
     the \l Style, taking \l {Theme}{Themes}, \l {StyleVariation}{StyleVariations},
-    \l {AbstractStylableControls}{fallback types}, and property propagation
+    \l {StylableControls}{fallback types}, and property propagation
     into account.
 
     When implementing a \l CustomControl, you can follow the same approach as
diff --git a/src/labs/stylekit/qqstylekitstyle.cpp b/src/labs/stylekit/qqstylekitstyle.cpp
index d185fb2fac..da70ff949e 100644
--- a/src/labs/stylekit/qqstylekitstyle.cpp
+++ b/src/labs/stylekit/qqstylekitstyle.cpp
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 
     \l Style is the root type in StyleKit for defining a complete visual style for
     \l [QtQuickControls] {Qt Quick Controls}. A style lets you customize
-    the appearance of \l {AbstractStylableControls}{every control type}
+    the appearance of \l {StylableControls}{every control type}
     — \l {ControlStateStyle::background}{backgrounds}, \l {ControlStateStyle::indicator}{indicators},
     \l {ControlStateStyle::handle}{handles}, \l {ControlStateStyle::}{text},
     \l {ControlStateStyle::}{padding}, and more
diff --git a/src/labs/stylekit/qqstylekitstyleandthemebase.cpp b/src/labs/stylekit/qqstylekitstyleandthemebase.cpp
index 8f310f2649..654e749b1d 100644
--- a/src/labs/stylekit/qqstylekitstyleandthemebase.cpp
+++ b/src/labs/stylekit/qqstylekitstyleandthemebase.cpp
@@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype AbstractStyle
     \inqmlmodule Qt.labs.StyleKit
-    \inherits AbstractStylableControls
+    \inherits StylableControls
     \brief Abstract base type with properties common to both \l Style and \l Theme.
 
     AbstractStyle contains properties, such and fonts and palettes, that are
diff --git a/src/labs/stylekit/qqstylekitvariation.cpp b/src/labs/stylekit/qqstylekitvariation.cpp
index 6555984d4a..6845ca58d1 100644
--- a/src/labs/stylekit/qqstylekitvariation.cpp
+++ b/src/labs/stylekit/qqstylekitvariation.cpp
@@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmltype StyleVariation
     \inqmlmodule Qt.labs.StyleKit
-    \inherits AbstractStylableControls
+    \inherits StylableControls
     \brief Defines alternative styling for specific controls.
 
 
@@ -56,8 +56,8 @@ QT_BEGIN_NAMESPACE
 
     \snippet TypeVariationSnippets.qml frame with variation
 
-    Because \l {AbstractStylableControls::}{groupBox} falls back to
-    \l {AbstractStylableControls::}{frame} in the style hierarchy, type variations
+    Because \l {StylableControls::}{groupBox} falls back to
+    \l {StylableControls::}{frame} in the style hierarchy, type variations
     set on \c frame are automatically inherited by \c groupBox as well. To opt out,
     reset the variations for the subtype.
 
diff --git a/src/labs/stylekit/widgets/qstylekitstyle.cpp b/src/labs/stylekit/widgets/qstylekitstyle.cpp
index 92a1953c3a..1bff745e68 100644
--- a/src/labs/stylekit/widgets/qstylekitstyle.cpp
+++ b/src/labs/stylekit/widgets/qstylekitstyle.cpp
@@ -157,72 +157,72 @@ Q_STATIC_LOGGING_CATEGORY(lcStyleKit, "qt.labs.stylekit")
         \li StyleKit control
     \row
         \li QPushButton (flat)
-        \li \l {AbstractStylableControls::flatButton}{flatButton}
+        \li \l {StylableControls::flatButton}{flatButton}
     \row
         \li QPushButton
-        \li \l {AbstractStylableControls::button}{button}
+        \li \l {StylableControls::button}{button}
     \row
         \li QCheckBox
-        \li \l {AbstractStylableControls::checkBox}{checkBox}
+        \li \l {StylableControls::checkBox}{checkBox}
     \row
         \li QRadioButton
-        \li \l {AbstractStylableControls::radioButton}{radioButton}
+        \li \l {StylableControls::radioButton}{radioButton}
     \row
         \li QComboBox
-        \li \l {AbstractStylableControls::comboBox}{comboBox}
+        \li \l {StylableControls::comboBox}{comboBox}
     \row
         \li QSlider
-        \li \l {AbstractStylableControls::slider}{slider}
+        \li \l {StylableControls::slider}{slider}
     \row
         \li QScrollBar
-        \li \l {AbstractStylableControls::scrollBar}{scrollBar}
+        \li \l {StylableControls::scrollBar}{scrollBar}
     \row
         \li QSpinBox, QDoubleSpinBox
-        \li \l {AbstractStylableControls::spinBox}{spinBox}
+        \li \l {StylableControls::spinBox}{spinBox}
     \row
         \li QProgressBar
-        \li \l {AbstractStylableControls::progressBar}{progressBar}
+        \li \l {StylableControls::progressBar}{progressBar}
     \row
         \li QLineEdit
-        \li \l {AbstractStylableControls::textField}{textField}
+        \li \l {StylableControls::textField}{textField}
     \row
         \li QTextEdit, QPlainTextEdit
-        \li \l {AbstractStylableControls::textArea}{textArea}
+        \li \l {StylableControls::textArea}{textArea}
     \row
         \li QTabBar
-        \li \l {AbstractStylableControls::tabBar}{tabBar}
+        \li \l {StylableControls::tabBar}{tabBar}
     \row
         \li QTabWidget
-        \li \l {AbstractStylableControls::page}{page}
+        \li \l {StylableControls::page}{page}
     \row
         \li QToolBar
-        \li \l {AbstractStylableControls::toolBar}{toolBar}
+        \li \l {StylableControls::toolBar}{toolBar}
     \row
         \li QToolButton
-        \li \l {AbstractStylableControls::toolButton}{toolButton}
+        \li \l {StylableControls::toolButton}{toolButton}
     \row
         \li QGroupBox
-        \li \l {AbstractStylableControls::groupBox}{groupBox}
+        \li \l {StylableControls::groupBox}{groupBox}
     \row
         \li QFrame
-        \li \l {AbstractStylableControls::frame}{frame}
+        \li \l {StylableControls::frame}{frame}
     \row
         \li QLabel
-        \li \l {AbstractStylableControls::label}{label}
+        \li \l {StylableControls::label}{label}
     \row
         \li QMenu
-        \li \l {AbstractStylableControls::menu}{menu}
+        \li \l {StylableControls::menu}{menu}
     \row
         \li QMenuBar
-        \li \l {AbstractStylableControls::menuBar}{menuBar}
+        \li \l {StylableControls::menuBar}{menuBar}
     \row
         \li Everything else
-        \li \l {AbstractStylableControls::control}{control}
+        \li \l {StylableControls::control}{control}
     \endtable
 
     Widgets not listed above are not yet supported by QStyleKitStyle and will be
     painted by \l QCommonStyle. Support for remaining widgets is planned for future
-    releases. Conversely, some control entries in \l AbstractStylableControls have no
+    releases. Conversely, some control entries in \l StylableControls have no
     Qt Widgets equivalent and are not applied when styling widgets.
 
     \section2 Sub-controls within a widget
@@ -237,29 +237,29 @@ Q_STATIC_LOGGING_CATEGORY(lcStyleKit, "qt.labs.stylekit")
     \row
         \li \l QStyledItemDelegate items - the default delegate for all Qt item views,
             including the \l QComboBox popup list
-        \li \l {AbstractStylableControls::itemDelegate}{itemDelegate}
+        \li \l {StylableControls::itemDelegate}{itemDelegate}
     \row
         \li The same items, when user-checkable (i.e. showing a check indicator)
-        \li \l {AbstractStylableControls::checkDelegate}{checkDelegate};
+        \li \l {StylableControls::checkDelegate}{checkDelegate};
             falls back to \c itemDelegate for anything not set explicitly
     \row
         \li Individual tabs in a \l QTabBar
-        \li \l {AbstractStylableControls::tabButton}{tabButton}
+        \li \l {StylableControls::tabButton}{tabButton}
     \row
         \li \l QMenu items
-        \li \l {AbstractStylableControls::menuItem}{menuItem}
+        \li \l {StylableControls::menuItem}{menuItem}
     \row
         \li Separators in a \l QMenu
-        \li \l {AbstractStylableControls::menuSeparator}{menuSeparator}
+        \li \l {StylableControls::menuSeparator}{menuSeparator}
     \row
         \li \l QMenuBar items
-        \li \l {AbstractStylableControls::menuBarItem}{menuBarItem}
+        \li \l {StylableControls::menuBarItem}{menuBarItem}
     \row
         \li Separators in a \l QToolBar
-        \li \l {AbstractStylableControls::toolSeparator}{toolSeparator}
+        \li \l {StylableControls::toolSeparator}{toolSeparator}
     \row
         \li The \l QComboBox popup list container
-        \li \l {AbstractStylableControls::popup}{popup}
+        \li \l {StylableControls::popup}{popup}
     \endtable
 
     \section1 Known Limitations