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

41 files changed, 0 insertions, 0 deletions

diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
new file mode 100644
index 00000000..e418da04
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif
index 50986f1b..56a15867 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-tristate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif
index beacdb37..d70c0ee4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png
deleted file mode 100644
index a824949c..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
new file mode 100644
index 00000000..8d058d6c
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-tristate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
index d379f63c..da3fab98 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
index 0e8554ff..dccb6efc 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png
new file mode 100644
index 00000000..aa07d53a
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-popup-custom.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
deleted file mode 100644
index 9ce19e92..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
new file mode 100644
index 00000000..d6756d16
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png
deleted file mode 100644
index ec2e9ae9..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indeterminate.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
deleted file mode 100644
index 9ce19e92..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif b/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif
new file mode 100644
index 00000000..49af5f45
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
deleted file mode 100644
index d22a595b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
deleted file mode 100644
index 11a99d6f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
deleted file mode 100644
index d7c79ed1..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
deleted file mode 100644
index 8a49bf58..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif
new file mode 100644
index 00000000..4cbf3ed9
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png
deleted file mode 100644
index 6c217968..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
index 851064e9..b6afd6fe 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
deleted file mode 100644
index 8406fca6..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
deleted file mode 100644
index c5f658d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
deleted file mode 100644
index 535362bf..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
deleted file mode 100644
index c5f658d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
deleted file mode 100644
index c5f658d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
deleted file mode 100644
index 44509959..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
index 394e8085..d35b1502 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png
deleted file mode 100644
index abb033c2..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif
new file mode 100644
index 00000000..ed3ab607
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png
deleted file mode 100644
index b1abafb5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif
new file mode 100644
index 00000000..73007820
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
deleted file mode 100644
index ea0923cc..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
deleted file mode 100644
index 919a9a2b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
deleted file mode 100644
index e6c4179c..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
deleted file mode 100644
index e6c4179c..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif
new file mode 100644
index 00000000..ab233c5b
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-nosnap.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif
new file mode 100644
index 00000000..8eb4011f
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-snapalways.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif
new file mode 100644
index 00000000..f3b1d5c7
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-snaponrelease.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
index 7cb84b56..2ee56334 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-slider.png
deleted file mode 100644
index 2e27a604..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png
new file mode 100644
index 00000000..cdfee3d0
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-explicit.png