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

Conflicts:
	.qmake.conf

Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839

76 files changed, 13 insertions, 10 deletions

diff --git a/src/widgets/doc/images/fusion-checkbox.png b/src/widgets/doc/images/fusion-checkbox.png
deleted file mode 100644
index 669c3f8e23..0000000000
--- a/src/widgets/doc/images/fusion-checkbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-dateedit.png b/src/widgets/doc/images/fusion-dateedit.png
deleted file mode 100644
index b8ca972eaa..0000000000
--- a/src/widgets/doc/images/fusion-dateedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-datetimeedit.png b/src/widgets/doc/images/fusion-datetimeedit.png
deleted file mode 100644
index 48b6e320d5..0000000000
--- a/src/widgets/doc/images/fusion-datetimeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-dial.png b/src/widgets/doc/images/fusion-dial.png
deleted file mode 100644
index cdda89e02a..0000000000
--- a/src/widgets/doc/images/fusion-dial.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-doublespinbox.png b/src/widgets/doc/images/fusion-doublespinbox.png
deleted file mode 100644
index 4c7548c9be..0000000000
--- a/src/widgets/doc/images/fusion-doublespinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-fontcombobox.png b/src/widgets/doc/images/fusion-fontcombobox.png
deleted file mode 100644
index 96654b1bfa..0000000000
--- a/src/widgets/doc/images/fusion-fontcombobox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-frame.png b/src/widgets/doc/images/fusion-frame.png
deleted file mode 100644
index 09915bba0c..0000000000
--- a/src/widgets/doc/images/fusion-frame.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-groupbox.png b/src/widgets/doc/images/fusion-groupbox.png
deleted file mode 100644
index de2730b2e6..0000000000
--- a/src/widgets/doc/images/fusion-groupbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-horizontalscrollbar.png b/src/widgets/doc/images/fusion-horizontalscrollbar.png
deleted file mode 100644
index d890b1ce84..0000000000
--- a/src/widgets/doc/images/fusion-horizontalscrollbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-lcdnumber.png b/src/widgets/doc/images/fusion-lcdnumber.png
deleted file mode 100644
index 55ba6d2926..0000000000
--- a/src/widgets/doc/images/fusion-lcdnumber.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-lineedit.png b/src/widgets/doc/images/fusion-lineedit.png
deleted file mode 100644
index 5fd452db55..0000000000
--- a/src/widgets/doc/images/fusion-lineedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-listview.png b/src/widgets/doc/images/fusion-listview.png
deleted file mode 100644
index 3fcfbce6c4..0000000000
--- a/src/widgets/doc/images/fusion-listview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-progressbar.png b/src/widgets/doc/images/fusion-progressbar.png
deleted file mode 100644
index 4cd61eb3c2..0000000000
--- a/src/widgets/doc/images/fusion-progressbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-pushbutton.png b/src/widgets/doc/images/fusion-pushbutton.png
deleted file mode 100644
index 0e5aa1aad3..0000000000
--- a/src/widgets/doc/images/fusion-pushbutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-radiobutton.png b/src/widgets/doc/images/fusion-radiobutton.png
deleted file mode 100644
index 0b7097f2ef..0000000000
--- a/src/widgets/doc/images/fusion-radiobutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-slider.png b/src/widgets/doc/images/fusion-slider.png
deleted file mode 100644
index e5e3d20cf5..0000000000
--- a/src/widgets/doc/images/fusion-slider.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-spinbox.png b/src/widgets/doc/images/fusion-spinbox.png
deleted file mode 100644
index 0f8d75d372..0000000000
--- a/src/widgets/doc/images/fusion-spinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-tableview.png b/src/widgets/doc/images/fusion-tableview.png
deleted file mode 100644
index 8aedefccd2..0000000000
--- a/src/widgets/doc/images/fusion-tableview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-textedit.png b/src/widgets/doc/images/fusion-textedit.png
deleted file mode 100644
index 73d92feb15..0000000000
--- a/src/widgets/doc/images/fusion-textedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-timeedit.png b/src/widgets/doc/images/fusion-timeedit.png
deleted file mode 100644
index d38a139bc2..0000000000
--- a/src/widgets/doc/images/fusion-timeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-toolbox.png b/src/widgets/doc/images/fusion-toolbox.png
deleted file mode 100644
index fc4831cf5d..0000000000
--- a/src/widgets/doc/images/fusion-toolbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-toolbutton.png b/src/widgets/doc/images/fusion-toolbutton.png
deleted file mode 100644
index 32d2ca3677..0000000000
--- a/src/widgets/doc/images/fusion-toolbutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/fusion-treeview.png b/src/widgets/doc/images/fusion-treeview.png
deleted file mode 100644
index 3aa8bcef54..0000000000
--- a/src/widgets/doc/images/fusion-treeview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-calendarwidget.png b/src/widgets/doc/images/macintosh-calendarwidget.png
deleted file mode 100644
index 2f743501a9..0000000000
--- a/src/widgets/doc/images/macintosh-calendarwidget.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-checkbox.png b/src/widgets/doc/images/macintosh-checkbox.png
deleted file mode 100644
index d0130e3f22..0000000000
--- a/src/widgets/doc/images/macintosh-checkbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-combobox.png b/src/widgets/doc/images/macintosh-combobox.png
deleted file mode 100644
index c1dc3c0c96..0000000000
--- a/src/widgets/doc/images/macintosh-combobox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-dateedit.png b/src/widgets/doc/images/macintosh-dateedit.png
deleted file mode 100644
index 45aee90a9b..0000000000
--- a/src/widgets/doc/images/macintosh-dateedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-datetimeedit.png b/src/widgets/doc/images/macintosh-datetimeedit.png
deleted file mode 100644
index 62af02d64e..0000000000
--- a/src/widgets/doc/images/macintosh-datetimeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-dial.png b/src/widgets/doc/images/macintosh-dial.png
deleted file mode 100644
index df0ffe23a1..0000000000
--- a/src/widgets/doc/images/macintosh-dial.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-doublespinbox.png b/src/widgets/doc/images/macintosh-doublespinbox.png
deleted file mode 100644
index a0695ff278..0000000000
--- a/src/widgets/doc/images/macintosh-doublespinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-fontcombobox.png b/src/widgets/doc/images/macintosh-fontcombobox.png
deleted file mode 100644
index 8a5a3c78a3..0000000000
--- a/src/widgets/doc/images/macintosh-fontcombobox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-frame.png b/src/widgets/doc/images/macintosh-frame.png
deleted file mode 100644
index fee61a3643..0000000000
--- a/src/widgets/doc/images/macintosh-frame.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-groupbox.png b/src/widgets/doc/images/macintosh-groupbox.png
deleted file mode 100644
index f6c7bce580..0000000000
--- a/src/widgets/doc/images/macintosh-groupbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-horizontalscrollbar.png b/src/widgets/doc/images/macintosh-horizontalscrollbar.png
deleted file mode 100644
index 8b63572a9e..0000000000
--- a/src/widgets/doc/images/macintosh-horizontalscrollbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-label.png b/src/widgets/doc/images/macintosh-label.png
deleted file mode 100644
index 753aa4d138..0000000000
--- a/src/widgets/doc/images/macintosh-label.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-lcdnumber.png b/src/widgets/doc/images/macintosh-lcdnumber.png
deleted file mode 100644
index 2ea9ea0713..0000000000
--- a/src/widgets/doc/images/macintosh-lcdnumber.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-lineedit.png b/src/widgets/doc/images/macintosh-lineedit.png
deleted file mode 100644
index 0e992c7ffe..0000000000
--- a/src/widgets/doc/images/macintosh-lineedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-listview.png b/src/widgets/doc/images/macintosh-listview.png
deleted file mode 100644
index 346e6427ff..0000000000
--- a/src/widgets/doc/images/macintosh-listview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-menu.png b/src/widgets/doc/images/macintosh-menu.png
deleted file mode 100644
index 59bdceaab6..0000000000
--- a/src/widgets/doc/images/macintosh-menu.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-progressbar.png b/src/widgets/doc/images/macintosh-progressbar.png
deleted file mode 100644
index 2dfc8aba81..0000000000
--- a/src/widgets/doc/images/macintosh-progressbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-pushbutton.png b/src/widgets/doc/images/macintosh-pushbutton.png
deleted file mode 100644
index 7ec14910d8..0000000000
--- a/src/widgets/doc/images/macintosh-pushbutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-radiobutton.png b/src/widgets/doc/images/macintosh-radiobutton.png
deleted file mode 100644
index 8b02f509ff..0000000000
--- a/src/widgets/doc/images/macintosh-radiobutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-slider.png b/src/widgets/doc/images/macintosh-slider.png
deleted file mode 100644
index bf0c5464e9..0000000000
--- a/src/widgets/doc/images/macintosh-slider.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-spinbox.png b/src/widgets/doc/images/macintosh-spinbox.png
deleted file mode 100644
index 4196c37246..0000000000
--- a/src/widgets/doc/images/macintosh-spinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-tableview.png b/src/widgets/doc/images/macintosh-tableview.png
deleted file mode 100644
index e6512494de..0000000000
--- a/src/widgets/doc/images/macintosh-tableview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-tabwidget.png b/src/widgets/doc/images/macintosh-tabwidget.png
deleted file mode 100644
index 1d174a47e6..0000000000
--- a/src/widgets/doc/images/macintosh-tabwidget.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-textedit.png b/src/widgets/doc/images/macintosh-textedit.png
deleted file mode 100644
index 4f0ce36baf..0000000000
--- a/src/widgets/doc/images/macintosh-textedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-timeedit.png b/src/widgets/doc/images/macintosh-timeedit.png
deleted file mode 100644
index 4bcfce33f8..0000000000
--- a/src/widgets/doc/images/macintosh-timeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-toolbox.png b/src/widgets/doc/images/macintosh-toolbox.png
deleted file mode 100644
index 18d41ea595..0000000000
--- a/src/widgets/doc/images/macintosh-toolbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-toolbutton.png b/src/widgets/doc/images/macintosh-toolbutton.png
deleted file mode 100644
index f91331cc51..0000000000
--- a/src/widgets/doc/images/macintosh-toolbutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/macintosh-treeview.png b/src/widgets/doc/images/macintosh-treeview.png
deleted file mode 100644
index afda6d8372..0000000000
--- a/src/widgets/doc/images/macintosh-treeview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-calendarwidget.png b/src/widgets/doc/images/windowsvista-calendarwidget.png
deleted file mode 100644
index 3cb1ab78dc..0000000000
--- a/src/widgets/doc/images/windowsvista-calendarwidget.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-checkbox.png b/src/widgets/doc/images/windowsvista-checkbox.png
deleted file mode 100644
index b9bc909988..0000000000
--- a/src/widgets/doc/images/windowsvista-checkbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-combobox.png b/src/widgets/doc/images/windowsvista-combobox.png
deleted file mode 100644
index f53192f45a..0000000000
--- a/src/widgets/doc/images/windowsvista-combobox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-dateedit.png b/src/widgets/doc/images/windowsvista-dateedit.png
deleted file mode 100644
index bb79482849..0000000000
--- a/src/widgets/doc/images/windowsvista-dateedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-datetimeedit.png b/src/widgets/doc/images/windowsvista-datetimeedit.png
deleted file mode 100644
index 0a104de084..0000000000
--- a/src/widgets/doc/images/windowsvista-datetimeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-dial.png b/src/widgets/doc/images/windowsvista-dial.png
deleted file mode 100644
index 7081269c31..0000000000
--- a/src/widgets/doc/images/windowsvista-dial.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-doublespinbox.png b/src/widgets/doc/images/windowsvista-doublespinbox.png
deleted file mode 100644
index 6efa9379fd..0000000000
--- a/src/widgets/doc/images/windowsvista-doublespinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-frame.png b/src/widgets/doc/images/windowsvista-frame.png
deleted file mode 100644
index 63b8422d2b..0000000000
--- a/src/widgets/doc/images/windowsvista-frame.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-groupbox.png b/src/widgets/doc/images/windowsvista-groupbox.png
deleted file mode 100644
index 967d8878a7..0000000000
--- a/src/widgets/doc/images/windowsvista-groupbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-horizontalscrollbar.png b/src/widgets/doc/images/windowsvista-horizontalscrollbar.png
deleted file mode 100644
index 996865d66c..0000000000
--- a/src/widgets/doc/images/windowsvista-horizontalscrollbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-label.png b/src/widgets/doc/images/windowsvista-label.png
deleted file mode 100644
index caef8d8361..0000000000
--- a/src/widgets/doc/images/windowsvista-label.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-lcdnumber.png b/src/widgets/doc/images/windowsvista-lcdnumber.png
deleted file mode 100644
index 911438e2b1..0000000000
--- a/src/widgets/doc/images/windowsvista-lcdnumber.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-lineedit.png b/src/widgets/doc/images/windowsvista-lineedit.png
deleted file mode 100644
index 9fcde3a851..0000000000
--- a/src/widgets/doc/images/windowsvista-lineedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-listview.png b/src/widgets/doc/images/windowsvista-listview.png
deleted file mode 100644
index 36a03438ab..0000000000
--- a/src/widgets/doc/images/windowsvista-listview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-progressbar.png b/src/widgets/doc/images/windowsvista-progressbar.png
deleted file mode 100644
index 0bda010811..0000000000
--- a/src/widgets/doc/images/windowsvista-progressbar.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-slider.png b/src/widgets/doc/images/windowsvista-slider.png
deleted file mode 100644
index be2fffb7b5..0000000000
--- a/src/widgets/doc/images/windowsvista-slider.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-spinbox.png b/src/widgets/doc/images/windowsvista-spinbox.png
deleted file mode 100644
index 4a2293e724..0000000000
--- a/src/widgets/doc/images/windowsvista-spinbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-tableview.png b/src/widgets/doc/images/windowsvista-tableview.png
deleted file mode 100644
index 96f4937bc1..0000000000
--- a/src/widgets/doc/images/windowsvista-tableview.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-textedit.png b/src/widgets/doc/images/windowsvista-textedit.png
deleted file mode 100644
index 5e5696623e..0000000000
--- a/src/widgets/doc/images/windowsvista-textedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-timeedit.png b/src/widgets/doc/images/windowsvista-timeedit.png
deleted file mode 100644
index e24fdd268a..0000000000
--- a/src/widgets/doc/images/windowsvista-timeedit.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-toolbox.png b/src/widgets/doc/images/windowsvista-toolbox.png
deleted file mode 100644
index 8cfe5f9cab..0000000000
--- a/src/widgets/doc/images/windowsvista-toolbox.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-toolbutton.png b/src/widgets/doc/images/windowsvista-toolbutton.png
deleted file mode 100644
index 0baa9809c1..0000000000
--- a/src/widgets/doc/images/windowsvista-toolbutton.png
+++ /dev/null
diff --git a/src/widgets/doc/images/windowsvista-treeview.png b/src/widgets/doc/images/windowsvista-treeview.png
deleted file mode 100644
index db211e4b5f..0000000000
--- a/src/widgets/doc/images/windowsvista-treeview.png
+++ /dev/null
diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc
index 6253ae8d7d..c05b16a0a0 100644
--- a/src/widgets/doc/src/qtwidgets-index.qdoc
+++ b/src/widgets/doc/src/qtwidgets-index.qdoc
@@ -133,6 +133,10 @@ interfaces
         \section2 Tutorials
     \list
         \li \l{Widgets Tutorial}
+        \li \l{Getting Started Programming with Qt Widgets}
+        \li \l{Creating a Qt Widget Based Application}
+
+
         \li \l{Model/View Tutorial}
     \endlist
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
index 0d21d3242d..e507d66451 100644
--- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
@@ -57,15 +57,15 @@
     is set on a widget in this way, it takes charge of the following tasks:
 
     \list
-    \li Positioning of child widgets.
-    \li Sensible default sizes for windows.
-    \li Sensible minimum sizes for windows.
-    \li Resize handling.
+    \li Positioning of child widgets
+    \li Sensible default sizes for windows
+    \li Sensible minimum sizes for windows
+    \li Resize handling
     \li Automatic updates when contents change:
         \list
-        \li Font size, text or other contents of child widgets.
-        \li Hiding or showing a child widget.
-        \li Removal of child widgets.
+        \li Font size, text or other contents of child widgets
+        \li Hiding or showing a child widget
+        \li Removal of child widgets
         \endlist
     \endlist
 
@@ -392,7 +392,6 @@
     Many Qt Widgets \l{Qt Widgets Examples}{examples} already use layouts,
     however, several examples exist to showcase various layouts.
 
-    \list
-    \li \l{Layout Examples}
-    \endlist
+    \annotatedlist examples-layout
+
 */