diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:02:31 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:02:38 +0200 |
| commit | 41843bf7dc077675b8a33f87e1c70338be081069 (patch) | |
| tree | de86399483534a864a0cc2b05b2144be601886b3 /examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc | |
| parent | 72149cbb6fe7b1e6af4018c945ece738f8ad0a10 (diff) | |
| parent | bf470169749321d1c7e14ff0621836a7a252c13c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc')
| -rw-r--r-- | examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index 95e8329d..7e4edea4 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -62,7 +62,7 @@ \section1 Styling - The demo uses a custom \l {Styling Qt Quick Controls 2}{Qt Quick Controls 2 style} + The demo uses a custom \l {Styling Qt Quick Controls}{Qt Quick Controls 2 style} embedded into the demo's resources. The custom style is implemented for a few controls only, as it is specific to this particular demo. It uses a singleton type for various styling attributes, such as fonts and colors. @@ -114,7 +114,7 @@ \snippet wearable/wearable.cpp icons The icons are used on the Launcher Page, which is presented below. See - \l {Icons in Qt Quick Controls 2} for more details about icons and themes. + \l {Icons in Qt Quick Controls} for more details about icons and themes. \section1 Launcher Page |