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

Conflicts:
	.qmake.conf

Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839

2 files changed, 13 insertions, 10 deletions

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
+
 */