diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:45 +0200 |
commit | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (patch) | |
tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /examples/quickcontrols2/wearable | |
parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
parent | 567a5cf69ef39ba5e9d0558ee7d6caec4d69bf71 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie9314e1a5daa20cee9d95a3c42873dbe515b3333
Diffstat (limited to 'examples/quickcontrols2/wearable')
-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 |