diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:51:20 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:55:22 +0200 |
| commit | 6f617349cf865ca3a7befc0dd472b7c2510fc431 (patch) | |
| tree | 37e70da54a7f3101b82551ccd98508f8d9d64330 /examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc | |
| parent | 718e08392f34dc478ea010c08a4b9c77bb665dfc (diff) | |
| parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39
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 |