summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@qt.io>2020-10-27 18:10:15 +0100
committerJerome Pasion <jerome.pasion@qt.io>2020-10-29 09:26:15 +0100
commiteba088a67dc36037484a9c13e8c221488b1d4db0 (patch)
tree6978be7aa634c7a033a422fa829708cf25d41281
parentc15eb07c379a38d8e4d0a53bb86631667cbf576f (diff)
downloadqtdoc-eba088a67dc36037484a9c13e8c221488b1d4db0.tar.gz
Change terminology to "look and feel"
-should be "look and feel" Task-number: QTBUG-88010 Change-Id: I70f7eb8254ea081a52fae84cf0ce4c8a91452951 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--doc/src/overviews.qdoc2
-rw-r--r--doc/src/qmlapp/usecases/styling.qdoc2
-rw-r--r--doc/src/qt-intro.qdoc2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index af0956fd..76d259a3 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -48,7 +48,7 @@
\brief The Qt components for constructing native look and feel desktop UI's.
These pages are about Qt's traditional set of GUI components for
- building both native look & feel and custom UI's for the desktop
+ building both native look and feel and custom UI's for the desktop
environment. Use \l{Qt Quick} for building UI's for mobile devices.
*/
diff --git a/doc/src/qmlapp/usecases/styling.qdoc b/doc/src/qmlapp/usecases/styling.qdoc
index 92f80b50..034fdda6 100644
--- a/doc/src/qmlapp/usecases/styling.qdoc
+++ b/doc/src/qmlapp/usecases/styling.qdoc
@@ -57,7 +57,7 @@ introduced in Qt 5.1 and requires \l{Qt Quick} 2.1.
The \l{SystemPalette} type provides information about the system's palette
information. QML applications can use this information to set the appearance
-of visual types to match the native look-and-feel. In addition, on
+of visual types to match the native look and feel. In addition, on
\l{Desktop Platforms}{desktop} platforms, different color palettes are employed
when changing states, for example, when the application loses keyboard focus.
diff --git a/doc/src/qt-intro.qdoc b/doc/src/qt-intro.qdoc
index 7ff2b998..af828d17 100644
--- a/doc/src/qt-intro.qdoc
+++ b/doc/src/qt-intro.qdoc
@@ -41,7 +41,7 @@
Qt offers two UI frameworks for developers: \b{Qt Widget} and \b{Qt Quick}
\l{Qt Widget} is cross-platform and tightly integrates with desktop
- look 'n' feel. \l{Qt Quick} UIs are dynamic with fluid animations and are
+ look and feel. \l{Qt Quick} UIs are dynamic with fluid animations and are
optimal for touch interfaces. You can implement widget UIs in C++ and you
can implement Qt Quick UIs declaratively with QML and JavaScript. The
\l{User Interfaces} page compares both Qt Quick and Qt Widget UIs.