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

Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/qtquickcontrols2.qdocconf
	src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml
	src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml
	src/imports/controls/qtquickcontrols2plugin.cpp
	src/quicktemplates2/qquicktooltip.cpp
	src/quicktemplates2/qquicktooltip_p.h
	src/quicktemplates2/qquicktumbler.cpp
	tests/auto/controls/data/tst_spinbox.qml
	tests/auto/controls/data/tst_tumbler.qml
	tests/auto/qquickmaterialstyle/data/tst_material.qml

Change-Id: I25b7473b47739043b6f768603bece30b18021318

1 files changed, 31 insertions, 3 deletions

diff --git a/tests/auto/qquickmaterialstyle/data/tst_material.qml b/tests/auto/qquickmaterialstyle/data/tst_material.qml
index 63385a6e..9985997b 100644
--- a/tests/auto/qquickmaterialstyle/data/tst_material.qml
+++ b/tests/auto/qquickmaterialstyle/data/tst_material.qml
@@ -41,6 +41,7 @@
 import QtQuick 2.2
 import QtQuick.Window 2.2
 import QtTest 1.0
+import QtQuick.Templates 2.1 as T
 import QtQuick.Controls 2.1
 import QtQuick.Controls.Material 2.1
 
@@ -127,6 +128,7 @@ TestCase {
             visible: true
             property alias popup: popupInstance
             property alias label: labelInstance
+            property alias label2: labelInstance2
             Popup {
                 id: popupInstance
                 Label {
@@ -136,6 +138,14 @@ TestCase {
                 }
                 Component.onCompleted: open()
             }
+            T.Popup {
+                contentItem: Label {
+                    id: labelInstance2
+                    text: "test"
+                    color: Material.textSelectionColor
+                }
+                Component.onCompleted: open()
+            }
         }
     }
 
@@ -291,16 +301,19 @@ TestCase {
         var popupObject = popupComponent.createObject(testCase)
         compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
         compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label2.color.toString(), popupObject.Material.textSelectionColor.toString())
 
         popupObject.Material[prop] = data.value1
         compare(popupObject.Material[prop], data.value1)
         compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
         compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label2.color.toString(), popupObject.Material.textSelectionColor.toString())
 
         popupObject.Material[prop] = data.value2
         compare(popupObject.Material[prop], data.value2)
         compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString())
         compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString())
+        compare(popupObject.label2.color.toString(), popupObject.Material.textSelectionColor.toString())
 
         popupObject.destroy()
     }
@@ -500,11 +513,11 @@ TestCase {
         compare(control.Material[prop], "#80808080")
 
         // unknown
-        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material." + prop + " value: 123")
+        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":58:9: QML Button: unknown Material." + prop + " value: 123")
         control.Material[prop] = 123
-        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material." + prop + " value: foo")
+        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":58:9: QML Button: unknown Material." + prop + " value: foo")
         control.Material[prop] = "foo"
-        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":57:9: QML Button: unknown Material." + prop + " value: #1")
+        ignoreWarning(Qt.resolvedUrl("tst_material.qml") + ":58:9: QML Button: unknown Material." + prop + " value: #1")
         control.Material[prop] = "#1"
 
         control.destroy()
@@ -677,4 +690,19 @@ TestCase {
 
         window.destroy()
     }
+
+    Component {
+        id: busyIndicator
+        BusyIndicator { }
+    }
+
+    function test_shade() {
+        var control = busyIndicator.createObject(testCase)
+
+        compare(control.contentItem.color.toString(), Material.color(Material.Pink, Material.Shade500))
+        control.Material.theme = Material.Dark
+        compare(control.contentItem.color.toString(), Material.color(Material.Pink, Material.Shade200))
+
+        control.destroy()
+    }
 }