aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-11-06 13:57:43 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-11-09 12:58:42 +0100
commitd4302811127a966ed98737126e08aaa2ec814cd9 (patch)
tree1b338bf488c6fcaf1033624dc15b9b614c90a93f
parent111287de7a33d395073ba5817a32a219d55f3cc6 (diff)
Doc: use correct casing for Material style name
Change-Id: Ia2d10b9fd27c8e83bfd8ed8ae021391ba1df50f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc6
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc8
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 27b89a43..b6774439 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -811,11 +811,11 @@ Back in \c ContactPage.qml, we update the code to use the new type:
Now we need to add the Material version of the toolbar. File selectors expect
variants of a file to be in appropriately named directories that exist
alongside the default version of the file. This means that we need to add a
-folder named "+material" in the same directory that ChatToolBar.qml is in:
+folder named "+Material" in the same directory that ChatToolBar.qml is in:
the root folder. The "+" is required by \l QFileSelector as a way of ensuring
that the selection feature is not accidentally triggered.
-Here's \c +material/ChatToolBar.qml:
+Here's \c +Material/ChatToolBar.qml:
\quotefromfile chattutorial/chapter5-styling/+Material/ChatToolBar.qml
\skipto import
@@ -848,7 +848,7 @@ as possible. We'll test out the Material style first, so add an entry to
\c qtquickcontrols2.conf that tells it to use its dark theme:
\code
-[material]
+[Material]
Primary=Indigo
Accent=Indigo
Theme=Dark
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
index adda3b15..57efd67b 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-fileselectors.qdoc
@@ -45,17 +45,17 @@
The following example demonstrates a custom rounded button that has a
styled drop shadow in the \l {Material Style}{Material style}, and looks
flat in other styles. The files are organized so that the Material version
- of \c CustomButton.qml is placed into a \c +material sub-directory.
+ of \c CustomButton.qml is placed into a \c +Material sub-directory.
\code
:/main.qml
:/CustomButton.qml
- :/+material/CustomButton.qml
+ :/+Material/CustomButton.qml
\endcode
By default, \c main.qml will use \c CustomButton.qml for the \c CustomButton
type. However, when the application is run with the Material style, the
- \c material selector will be present and the \c +material/CustomButton.qml
+ \c Material selector will be present and the \c +Material/CustomButton.qml
version will be used instead.
\code \QtMinorVersion
@@ -99,7 +99,7 @@
a drop shadow for the background.
\code \QtMinorVersion
- // +material/CustomButton.qml
+ // +Material/CustomButton.qml
import QtQuick 2.\1
import QtGraphicalEffects 1.\1
import QtQuick.Controls 2.\1