Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/quicktemplates2/qquicktextarea_p_p.h
	src/quicktemplates2/qquicktextfield_p_p.h

Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7

1 files changed, 15 insertions, 17 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index 5685a852..eed4efe8 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -151,22 +151,19 @@
         \row
             \li \c QT_QUICK_CONTROLS_MATERIAL_ACCENT
             \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended
-                to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example
-                for example \c "Teal".
+                to use one of the \l {pre-defined Material colors}, for example \c "Teal".
         \row
             \li \c QT_QUICK_CONTROLS_MATERIAL_PRIMARY
             \li The value can be any \l {colorbasictypedocs}{color}, but it is recommended
-                to use one of the \l {Pre-defined Colors}{pre-defined colors}, for example
-                for example \c "BlueGrey".
+                to use one of the \l {pre-defined Material colors}, for example \c "BlueGrey".
         \row
             \li \c QT_QUICK_CONTROLS_MATERIAL_FOREGROUND
             \li The value can be any \l {colorbasictypedocs}{color}, or one of the
-                \l {Pre-defined Colors}{pre-defined colors}.
-
+                \l {pre-defined Material colors}.
         \row
             \li \c QT_QUICK_CONTROLS_MATERIAL_BACKGROUND
             \li The value can be any \l {colorbasictypedocs}{color}, or one of the
-                \l {Pre-defined Colors}{pre-defined colors}.
+                \l {pre-defined Material colors}.
     \endtable
 
     \section2 Dependency
@@ -184,7 +181,7 @@
     style-specific tweaks can be applied without creating a hard dependency to
     a style.
 
-    \section2 Pre-defined Colors
+    \section2 Pre-defined Material Colors
 
     Even though primary and accent can be any \l {colorbasictypedocs}{color}, it
     is recommended to use one of the pre-defined colors that have been designed
@@ -238,8 +235,8 @@
 
     There are several different
     \l {https://material.google.com/style/color.html#color-color-palette}{shades}
-    of each \l {Pre-defined Colors}{pre-defined color} that can be passed to the
-    \l {material-color-attached-method}{Material.color()} function:
+    of each \l {Pre-defined Material Colors}{pre-defined color} that can be passed
+    to the \l {material-color-attached-method}{Material.color()} function:
     \value Material.Shade50
     \value Material.Shade100
     \value Material.Shade200
@@ -267,8 +264,8 @@
     The default value is \c Material.Pink.
 
     \note Even though the accent can be any \l {colorbasictypedocs}{color}, it is
-    recommended to use one of the \l {pre-defined colors} that have been designed
-    to work well with the rest of the Material style palette.
+    recommended to use one of the \l {pre-defined Material colors} that have been
+    designed to work well with the rest of the Material style palette.
 
     \endstyleproperty
 
@@ -308,8 +305,8 @@
     The default value is \c Material.Indigo.
 
     \note Even though the primary can be any \l {colorbasictypedocs}{color}, it is
-    recommended to use one of the \l {pre-defined colors} that have been designed
-    to work well with the rest of the Material style palette.
+    recommended to use one of the \l {pre-defined Material colors} that have been
+    designed to work well with the rest of the Material style palette.
 
     \endstyleproperty
 
@@ -333,9 +330,10 @@
 
     \stylemethod2 {color} {color} {enumeration} {predefined} {enumeration} {shade} {material-color-attached-method}
     \target material-color-attached-method
-    This attached method returns the color value of the specified \l {pre-defined colors}
-    {pre-defined color} combined with the given \l {pre-defined colors}{shade}.
-    If omitted, the shade argument defaults to \c Material.Shade500.
+    This attached method returns the effective color value of the specified
+    \l {pre-defined Material colors}{pre-defined Material color} combined with
+    the given \l {pre-defined shades}{shade}. If omitted, the shade argument
+    defaults to \c Material.Shade500.
 
     \qml
     import QtQuick 2.0