diff options
| author | Jerome Pasion <jerome.pasion@qt.io> | 2026-02-28 16:06:43 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2026-03-09 18:53:34 +0000 |
| commit | e602a097ca314e9610b1fd3b7dbfa467a868731a (patch) | |
| tree | a59ffcedd7cf65b8d2be249c9656f7d540a4a104 | |
| parent | 8bb90e9d1c36dee49ffdc724c6716bdd7a8b00e9 (diff) | |
-Updated link targets
-Some documentation style fixes
Task-number: QTBUG-144529
Change-Id: I1e07d663bcaf9bbabc5d1e2863733e38bdba7abf
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Topi Reinio <topi.reinio@qt.io>
(cherry picked from commit 35a190c5e654631dbb69a7c52dc3ac64bd47f0a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5a8d706f6ea593fb3424ffe3ec3d8a479ce644bf)
| -rw-r--r-- | src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc | 2 | ||||
| -rw-r--r-- | src/labs/stylekit/qqstylekitcontrol.cpp | 16 | ||||
| -rw-r--r-- | src/labs/stylekit/qqstylekitcontrols.cpp | 5 | ||||
| -rw-r--r-- | src/labs/stylekit/qqstylekitstyle.cpp | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc b/src/labs/stylekit/doc/src/qtlabsstylekit-index.qdoc index bf01245ad8..2a43c04a5e 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 {StyleKitControls::}{abstractButton}, and it + on a base type like \l {AbstractStylableControls::}{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/qqstylekitcontrol.cpp b/src/labs/stylekit/qqstylekitcontrol.cpp index 12dc023c50..f0d482c6e6 100644 --- a/src/labs/stylekit/qqstylekitcontrol.cpp +++ b/src/labs/stylekit/qqstylekitcontrol.cpp @@ -11,18 +11,18 @@ QT_BEGIN_NAMESPACE \qmltype ControlStyle \inqmlmodule Qt.labs.StyleKit \inherits ControlStateStyle - \brief Defines the style for a control in the \c normal state + \brief Defines the style for a control in the \c normal state. A ControlStyle describes how a \l Control should be styled. Its API largely mirrors that of a Qt Quick Control: it provides grouped properties for delegates such as - \l {ControlState::background}{background}, - \l {ControlState::indicator}{indicator}, - \l {ControlState::handle}{handle}, and - \l {ControlState::text}{text}, along with layout + \l {ControlStateStyle::background}{background}, + \l {ControlStateStyle::indicator}{indicator}, + \l {ControlStateStyle::handle}{handle}, and + \l {ControlStateStyle::text}{text}, along with layout properties such as - \l {ControlState::padding}{padding} and - \l {ControlState::spacing}{spacing}. + \l {ControlStateStyle::padding}{padding} and + \l {ControlStateStyle::spacing}{spacing}. If you are familiar with the API of a \l Control in Qt Quick Controls, you should find the ControlStyle API easy to follow. @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE Unlike instance variations — which are applied to specific control instances from the application via the - \l {StyleVariation.variations} attached property — type + \l {StyleVariation::variations} attached property — type variations are applied to \e{all} instances of a control type from the \l Style, without requiring the application to opt in. diff --git a/src/labs/stylekit/qqstylekitcontrols.cpp b/src/labs/stylekit/qqstylekitcontrols.cpp index 2314c798a9..955ff58616 100644 --- a/src/labs/stylekit/qqstylekitcontrols.cpp +++ b/src/labs/stylekit/qqstylekitcontrols.cpp @@ -253,8 +253,9 @@ QT_BEGIN_NAMESPACE Grouped property for styling \l [QtQuickControls]{ScrollView}. ScrollView itself has no visual delegates to style. Its scroll bars can be - styled separately through the \l scrollBar property. But you can use \l padding - to control the space between the scroll bars and the content area. + styled separately through the \l scrollBar property. But you can use + \l {ControlStateStyle::padding}{padding} to control the space between + the scroll bars and the content area. Unset properties fall back to \l control. diff --git a/src/labs/stylekit/qqstylekitstyle.cpp b/src/labs/stylekit/qqstylekitstyle.cpp index ac68c21c2d..ed591bf5ce 100644 --- a/src/labs/stylekit/qqstylekitstyle.cpp +++ b/src/labs/stylekit/qqstylekitstyle.cpp @@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE active theme, StyleKit looks it up in the fallback style. By default, the fallback style is set to an internal style that provides - a basic appearance similar to the \l {Qt Quick Controls - Basic Style}{Basic} style. + a basic appearance similar to the \l {Basic Style}{Basic} style. You can set this to a custom Style, or to \c null to disable fallback resolution entirely. Note that setting it to \c null |
