diff options
| author | Jerome Pasion <jerome.pasion@qt.io> | 2020-10-28 21:14:06 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@qt.io> | 2020-10-29 10:13:03 +0100 |
| commit | ce11c70fbbb46505d52541f7bfddec81cdcf9432 (patch) | |
| tree | 275b08278350873c8ac704e7028632b77d9057d8 | |
| parent | b5cc89450d2b211ed582c9c8001f072d7b9bf82d (diff) | |
Change terminology to "look and feel"
-should be "look and feel"
Task-number: QTBUG-88010
Change-Id: I8fa72334a7fb0aab7e057422364966055ac39584
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc | 4 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -13,7 +13,7 @@ development of entire custom styles and user experiences. Qt Quick Controls 2 comes with a selection of built-in styles: - Default style - a simple and minimal all-round style that offers the maximum performance -- Fusion style - a platform-agnostic style that offers a desktop-oriented look'n'feel +- Fusion style - a platform-agnostic style that offers a desktop-oriented look and feel - Imagine style - a designer-friendly style based on image assets - Material style - a style based on the Google Material Design Guidelines - Universal style - a style based on the Microsoft Universal Design Guidelines diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc index a99e56fd..b7929061 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc @@ -32,8 +32,8 @@ The Fusion style is a desktop-oriented style. The Fusion style is a platform-agnostic style that offers a desktop-oriented - look'n'feel. It implements the same design language as the \l {Qt Widget Gallery} - {Fusion style for Qt Widgets}. + look and feel. It implements the same design language as the + \l {Qt Widget Gallery}{Fusion style for Qt Widgets}. \image qtquickcontrols2-fusion.png diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index a26287fc..f9d7c0f2 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -43,7 +43,7 @@ \image qtquickcontrols2-fusion-thumbnail.png The \l {Fusion Style} is a platform-agnostic style that offers a desktop-oriented - look'n'feel for Qt Quick Controls. + look and feel for Qt Quick Controls. \section2 Imagine Style |