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

Comparing colors in tst_material.qml works fine now.

Conflicts:
	examples/quickcontrols2/gallery/qtquickcontrols2.conf
	tests/auto/material/data/tst_material.qml

Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325

27 files changed, 17 insertions, 7 deletions

diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
index 57ec1026..9109fdda 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
index 5b34264e..3cbfbe65 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png
diff --git a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
index 5c2bb682..e69e7e46 100644
--- a/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
+++ b/examples/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml
index 567325ad..113874a9 100644
--- a/examples/quickcontrols2/gallery/gallery.qml
+++ b/examples/quickcontrols2/gallery/gallery.qml
@@ -58,6 +58,8 @@ ApplicationWindow {
     }
 
     header: ToolBar {
+        Material.foreground: "white"
+
         RowLayout {
             spacing: 20
             anchors.fill: parent
diff --git a/examples/quickcontrols2/gallery/gallery.qrc b/examples/quickcontrols2/gallery/gallery.qrc
index ba5fb595..01c61324 100644
--- a/examples/quickcontrols2/gallery/gallery.qrc
+++ b/examples/quickcontrols2/gallery/gallery.qrc
@@ -18,6 +18,14 @@
         <file>images/menu@2x.png</file>
         <file>images/menu@3x.png</file>
         <file>images/menu@4x.png</file>
+        <file>images/+material/drawer.png</file>
+        <file>images/+material/drawer@2x.png</file>
+        <file>images/+material/drawer@3x.png</file>
+        <file>images/+material/drawer@4x.png</file>
+        <file>images/+material/menu.png</file>
+        <file>images/+material/menu@2x.png</file>
+        <file>images/+material/menu@3x.png</file>
+        <file>images/+material/menu@4x.png</file>
         <file>images/qt-logo.png</file>
         <file>images/qt-logo@2x.png</file>
         <file>images/qt-logo@3x.png</file>
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer.png b/examples/quickcontrols2/gallery/images/+material/drawer.png
new file mode 100644
index 00000000..615cc817
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@2x.png b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png
new file mode 100644
index 00000000..b1dd106d
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@2x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@3x.png b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png
new file mode 100644
index 00000000..289889bf
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@3x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/drawer@4x.png b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png
new file mode 100644
index 00000000..215e6a82
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/drawer@4x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu.png b/examples/quickcontrols2/gallery/images/+material/menu.png
new file mode 100644
index 00000000..f02429e9
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@2x.png b/examples/quickcontrols2/gallery/images/+material/menu@2x.png
new file mode 100644
index 00000000..9309ad9a
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@2x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@3x.png b/examples/quickcontrols2/gallery/images/+material/menu@3x.png
new file mode 100644
index 00000000..7bddf71f
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@3x.png
diff --git a/examples/quickcontrols2/gallery/images/+material/menu@4x.png b/examples/quickcontrols2/gallery/images/+material/menu@4x.png
new file mode 100644
index 00000000..e5c23a3b
--- /dev/null
+++ b/examples/quickcontrols2/gallery/images/+material/menu@4x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow.png b/examples/quickcontrols2/gallery/images/arrow.png
index 340139de..d81accbb 100644
--- a/examples/quickcontrols2/gallery/images/arrow.png
+++ b/examples/quickcontrols2/gallery/images/arrow.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@2x.png b/examples/quickcontrols2/gallery/images/arrow@2x.png
index ef2016e9..309c0187 100644
--- a/examples/quickcontrols2/gallery/images/arrow@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@3x.png b/examples/quickcontrols2/gallery/images/arrow@3x.png
index 86c8506b..e146ecc9 100644
--- a/examples/quickcontrols2/gallery/images/arrow@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrow@4x.png b/examples/quickcontrols2/gallery/images/arrow@4x.png
index ce70d95b..b2ad27f3 100644
--- a/examples/quickcontrols2/gallery/images/arrow@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrow@4x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows.png b/examples/quickcontrols2/gallery/images/arrows.png
index f77e01fa..d38b94a4 100644
--- a/examples/quickcontrols2/gallery/images/arrows.png
+++ b/examples/quickcontrols2/gallery/images/arrows.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@2x.png b/examples/quickcontrols2/gallery/images/arrows@2x.png
index 9615d436..69b9342b 100644
--- a/examples/quickcontrols2/gallery/images/arrows@2x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@2x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@3x.png b/examples/quickcontrols2/gallery/images/arrows@3x.png
index b6a53e1c..77032526 100644
--- a/examples/quickcontrols2/gallery/images/arrows@3x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@3x.png
diff --git a/examples/quickcontrols2/gallery/images/arrows@4x.png b/examples/quickcontrols2/gallery/images/arrows@4x.png
index 099ed1b5..66c1fac5 100644
--- a/examples/quickcontrols2/gallery/images/arrows@4x.png
+++ b/examples/quickcontrols2/gallery/images/arrows@4x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo.png b/examples/quickcontrols2/gallery/images/qt-logo.png
index 8b0772b0..90e6f905 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@2x.png b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
index 0d1d499b..22d111ad 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@2x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@2x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@3x.png b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
index c9aae358..627746cd 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@3x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@3x.png
diff --git a/examples/quickcontrols2/gallery/images/qt-logo@4x.png b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
index ad0ebd03..dc62286d 100644
--- a/examples/quickcontrols2/gallery/images/qt-logo@4x.png
+++ b/examples/quickcontrols2/gallery/images/qt-logo@4x.png
diff --git a/examples/quickcontrols2/gallery/pages/DelegatePage.qml b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
index c3fa06c5..3d175fd8 100644
--- a/examples/quickcontrols2/gallery/pages/DelegatePage.qml
+++ b/examples/quickcontrols2/gallery/pages/DelegatePage.qml
@@ -70,13 +70,13 @@ Pane {
             text: labelText
             width: parent.width
 
-            onClicked: if (exposure.active) view.model.remove(ourIndex)
+            onClicked: if (swipe.complete) view.model.remove(ourIndex)
 
             Component {
                 id: removeComponent
 
                 Rectangle {
-                    color: swipeDelegate.exposed && swipeDelegate.pressed ? "#333" : "#444"
+                    color: swipeDelegate.swipe.complete && swipeDelegate.pressed ? "#333" : "#444"
                     width: parent.width
                     height: parent.height
                     clip: true
@@ -90,8 +90,8 @@ Pane {
                 }
             }
 
-            exposure.left: removeComponent
-            exposure.right: removeComponent
+            swipe.left: removeComponent
+            swipe.right: removeComponent
         }
     }
 
diff --git a/examples/quickcontrols2/gallery/qtquickcontrols2.conf b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
index e219ac1a..da1a8f41 100644
--- a/examples/quickcontrols2/gallery/qtquickcontrols2.conf
+++ b/examples/quickcontrols2/gallery/qtquickcontrols2.conf
@@ -1,8 +1,8 @@
 [Material]
-Primary=LightGreen
-Accent=LightGreen
+Primary=#41cd52
+Accent=#41cd52
 Theme=System
 
 [Universal]
-Accent=Green
+Accent=#41cd52
 Theme=System