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

Conflicts:
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
	src/quicktemplates2/qquickmenu.cpp
	tests/auto/controls/data/tst_buttongroup.qml
	tests/auto/controls/data/tst_swipedelegate.qml

Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015

4 files changed, 39 insertions, 16 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
index 48b0097d..5e2c9370 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc
@@ -50,16 +50,7 @@
     to perform an action. The most common examples are Apply, Cancel,
     Save, Close and Help.
 
-    \table
-    \row \li \image qtquickcontrols2-button-normal.png
-         \li A button in its normal state.
-    \row \li \image qtquickcontrols2-button-pressed.png
-         \li A button that is pressed.
-    \row \li \image qtquickcontrols2-button-focused.png
-         \li A button that has active focus.
-    \row \li \image qtquickcontrols2-button-disabled.png
-         \li A button that is disabled.
-    \endtable
+    \image qtquickcontrols2-button.gif
 
     Recommendations:
 
@@ -75,7 +66,7 @@
 
     \section1 CheckBox Control
 
-    \image qtquickcontrols2-checkbox.png
+    \image qtquickcontrols2-checkbox.gif
 
     \l CheckBox is used to build multi-selection option lists. Any number of
     options can be selected, including none, but the options should
@@ -111,7 +102,7 @@
 
     \section1 RadioButton Control
 
-    \image qtquickcontrols2-radiobutton.png
+    \image qtquickcontrols2-radiobutton.gif
 
     \l RadioButton is used to select only one option from a set of options.
     Selecting one option automatically deselects the one selected before.
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index bdd69f8e..866aef23 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -335,6 +335,38 @@
     \l {Customizing a Control} section. The code can be used as a starting
     point to implement a custom look and feel.
 
+    \section2 Customizing ApplicationWindow
+
+        ApplicationWindow consists of one visual item:
+        \l {ApplicationWindow::background}{background}. It is also possible
+        to customize the \l {ApplicationWindow::overlay}{modal} and
+        \l {ApplicationWindow::overlay}{modeless} items.
+
+        \code
+        import QtQuick 2.7
+        import QtQuick.Controls 2.0
+
+        ApplicationWindow {
+            visible: true
+
+            background: Rectangle {
+                gradient: Gradient {
+                    GradientStop { position: 0; color: "#ffffff" }
+                    GradientStop { position: 1; color: "#c1bbf9" }
+                }
+            }
+
+            overlay.modal: Rectangle {
+                color: "#8f28282a"
+            }
+
+            overlay.modeless: Rectangle {
+                color: "#2f28282a"
+            }
+        }
+        \endcode
+
+
     \section2 Customizing BusyIndicator
 
         BusyIndicator consists of two visual items: \l {Control::background}{background}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
index 010ff444..03750844 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc
@@ -54,7 +54,7 @@
 
     \section1 ScrollBar Control
 
-    \image qtquickcontrols2-scrollbar.png
+    \image qtquickcontrols2-scrollbar.gif
 
     \l ScrollBar is an interactive bar that indicates the current scroll
     position, and can be used to scroll to a specific position in a
@@ -62,7 +62,7 @@
 
     \section1 ScrollIndicator Control
 
-    \image qtquickcontrols2-scrollindicator.png
+    \image qtquickcontrols2-scrollindicator.gif
 
     \l ScrollIndicator is a non-interactive indicator that indicates the
     current scroll position, and can be used to scroll to a specific position in a
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
index 681a9d89..c3583fd1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc
@@ -85,13 +85,13 @@
 
     \section1 Slider Control
 
-    \image qtquickcontrols2-slider.png
+    \image qtquickcontrols2-slider.gif
 
     \l Slider is used to select a value by sliding a handle along a track.
 
     \section1 RangeSlider Control
 
-    \image qtquickcontrols2-rangeslider.png
+    \image qtquickcontrols2-rangeslider.gif
 
     \l RangeSlider is used to select a range specified by two values,
     by sliding each handle along a track.