diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
| commit | 29400a683f96867133b28299c0d0bd6bcf40df35 (patch) | |
| tree | b616dfb91ce111d61a34a67b28069561306575da /src/widgets/doc/src/widgets-and-layouts | |
| parent | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (diff) | |
| parent | 9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d
Diffstat (limited to 'src/widgets/doc/src/widgets-and-layouts')
| -rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/gallery.qdoc | 2 | ||||
| -rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc index a82462a432..d0673f207b 100644 --- a/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc @@ -35,7 +35,7 @@ The widgets examples show how some of the widgets available in Qt might appear when configured to use the a particular style. Each style is only - available on the respective platfom, and provides native look and feel by + available on the respective platform, and provides native look and feel by integrating to the platform theme. Thus, the final appearance varies depending on the active theme. diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index 8dc68117aa..c4b77f42c4 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -1033,7 +1033,7 @@ The slider can be styled using the \l{#handle-sub}{::handle} subcontrol. Setting the \l{#min-width-prop}{min-width} or \l{#min-height-prop}{min-height} - provides size contraints for the slider depending on the orientation. + provides size constraints for the slider depending on the orientation. The \l{add-line-sub}{::add-line} subcontrol can be used to style the button to add a line. By default, the add-line subcontrol is placed in @@ -1950,7 +1950,7 @@ The only widget currently supporting this property is QPushButton. - \note It's the application's responsibilty to assign an icon to a + \note It's the application's responsibility to assign an icon to a button (using the QAbstractButton API), and not the style's. So be careful setting it unless your stylesheet is targeting a specific application. |