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

Conflicts:
	src/imports/controls/material/qquickmaterialstyle.cpp
	src/imports/controls/universal/qquickuniversalstyle.cpp
	src/quicktemplates2/qquickpopup_p_p.h
	src/quicktemplates2/qquicktooltip.cpp
	tests/auto/auto.pro

Change-Id: I88b347dd85278e14f7b2ca468e30648c6432b6f2

1 files changed, 10 insertions, 0 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index d338e745..78ba88da 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -246,17 +246,27 @@ private:
     QColor buttonColor(bool highlighted) const;
     Shade themeShade() const;
 
+    // These reflect whether a color value was explicitly set on the specific
+    // item that this attached style object represents.
     bool m_explicitTheme;
     bool m_explicitPrimary;
     bool m_explicitAccent;
     bool m_explicitForeground;
     bool m_explicitBackground;
+    // These reflect whether the color value that was either inherited or
+    // explicitly set is in the form that QColor expects, rather than one of
+    // our pre-defined color enum values.
     bool m_customPrimary;
     bool m_customAccent;
     bool m_customForeground;
     bool m_customBackground;
+    // These will be true when this item has an explicit or inherited foreground/background
+    // color, or these colors were declared globally via settings (e.g. conf or env vars).
+    // Some color properties of the style will return different values depending on whether
+    // or not these are set.
     bool m_hasForeground;
     bool m_hasBackground;
+    // The actual values for this item, whether explicit, inherited or globally set.
     Theme m_theme;
     uint m_primary;
     uint m_accent;