diff options
-rw-r--r-- | src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc | 5 | ||||
-rw-r--r-- | src/quickcontrols/doc/src/qtquickcontrols-material.qdoc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc b/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc index 803425a88b..dc02dffe39 100644 --- a/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc +++ b/src/quickcontrols/doc/src/includes/qquickmaterialstyle.qdocinc @@ -77,3 +77,8 @@ for example \c "Grey". \endtable //! [env] + +//! [placeholder-text-multiple-lines] +As per the Material guidelines, placeholder text should be kept short and not +take up multiple lines. +//! [placeholder-text-multiple-lines] diff --git a/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc index 34ce6fc6f8..c361f5f1a7 100644 --- a/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc +++ b/src/quickcontrols/doc/src/qtquickcontrols-material.qdoc @@ -32,7 +32,7 @@ \section1 Detailed Description \target detailed-desc-material - The Material style is based on the \l {https://www.google.com/design/spec/material-design/introduction.html} + The Material style is based on the \l {https://m3.material.io} {Google Material Design Guidelines}. It allows for a unified experience across platforms and device sizes. @@ -259,6 +259,8 @@ \l {Item::}{clip} to \c true. To avoid this, \l {Control::}{topInset} is set to an appropriate value in these cases. + \include qquickmaterialstyle.qdocinc placeholder-text-multiple-lines + \section3 TextField The same \l {material-control-specific-notes-textarea}{issue with clipping} @@ -266,6 +268,8 @@ this, \l {Control::}{topInset} is set to an appropriate value when the TextField sets clip to \c true. + \include qquickmaterialstyle.qdocinc placeholder-text-multiple-lines + \section1 Attached Property Documentation \styleproperty {Material.accent} {color} {material-accent-attached-prop} |