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

Conflicts:
	.qmake.conf

Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839

11 files changed, 13 insertions, 8 deletions

diff --git a/examples/gui/doc/src/rasterwindow.qdoc b/examples/gui/doc/src/rasterwindow.qdoc
index d276925059..36612e1707 100644
--- a/examples/gui/doc/src/rasterwindow.qdoc
+++ b/examples/gui/doc/src/rasterwindow.qdoc
@@ -74,14 +74,9 @@
 
     \snippet rasterwindow/rasterwindow.cpp 1
 
-    The constructor first of all calls \l QWindow::create(). This will
-    create the window in the windowing system. Without calling create,
-    the window will not get events and will not be visible in the
-    windowing system. The call to create does not show the window. We
-    then set the geometry to be something reasonable.
-
-    Then we create the backingstore and pass it the window instance it
-    is supposed to manage.
+    In the constructor we create the backingstore and pass it the window
+    instance it is supposed to manage. We also set the initial window
+    geometry.
 
     \snippet rasterwindow/rasterwindow.cpp 2
 
diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc
index c3cd06fed5..31d1d64dac 100644
--- a/examples/widgets/doc/src/addressbook-tutorial.qdoc
+++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc
@@ -29,6 +29,7 @@
     \page tutorials-addressbook.html
 
     \title Address Book Tutorial
+    \ingroup examples-layout
     \brief An introduction to GUI programming, showing how to put together a
     simple yet fully-functioning application.
 
diff --git a/examples/widgets/doc/src/borderlayout.qdoc b/examples/widgets/doc/src/borderlayout.qdoc
index fded69c541..c8f2ae4196 100644
--- a/examples/widgets/doc/src/borderlayout.qdoc
+++ b/examples/widgets/doc/src/borderlayout.qdoc
@@ -28,6 +28,7 @@
 /*!
     \example layouts/borderlayout
     \title Border Layout Example
+    \ingroup examples-layout
     \brief Shows how to arrange child widgets along a border.
 
     \e{Border Layout} implements a layout that arranges child widgets to
diff --git a/examples/widgets/doc/src/calculator.qdoc b/examples/widgets/doc/src/calculator.qdoc
index 83d85a7fe8..e8f8030207 100644
--- a/examples/widgets/doc/src/calculator.qdoc
+++ b/examples/widgets/doc/src/calculator.qdoc
@@ -29,6 +29,7 @@
     \example widgets/calculator
     \title Calculator Example
     \ingroup examples-widgets
+    \ingroup examples-layout
     \brief The example shows how to use signals and slots to implement the
     functionality of a calculator widget, and how to use QGridLayout
     to place child widgets in a grid.
diff --git a/examples/widgets/doc/src/calendarwidget.qdoc b/examples/widgets/doc/src/calendarwidget.qdoc
index c2d86d830c..eaf8f547da 100644
--- a/examples/widgets/doc/src/calendarwidget.qdoc
+++ b/examples/widgets/doc/src/calendarwidget.qdoc
@@ -29,6 +29,7 @@
     \title Calendar Widget Example
     \example widgets/calendarwidget
     \ingroup examples-widgets
+    \ingroup examples-layout
     \brief The Calendar Widget example shows use of QCalendarWidget.
 
     \borderedimage calendarwidgetexample.png
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc
index 512970d3e6..28be789c5c 100644
--- a/examples/widgets/doc/src/echoplugin.qdoc
+++ b/examples/widgets/doc/src/echoplugin.qdoc
@@ -29,6 +29,7 @@
     \example tools/echoplugin
     \title Echo Plugin Example
     \ingroup examples-widgets-tools
+    \ingroup examples-layout
 
     \brief This example shows how to create a Qt plugin.
 
diff --git a/examples/widgets/doc/src/flowlayout.qdoc b/examples/widgets/doc/src/flowlayout.qdoc
index ebcb1ace84..c907cb3af7 100644
--- a/examples/widgets/doc/src/flowlayout.qdoc
+++ b/examples/widgets/doc/src/flowlayout.qdoc
@@ -28,6 +28,7 @@
 /*!
     \example layouts/flowlayout
     \title Flow Layout Example
+    \ingroup examples-layout
     \brief Shows how to arrange widgets for different window sizes.
 
     \e{Flow Layout} implements a layout that handles different window sizes. The
diff --git a/examples/widgets/doc/src/imagecomposition.qdoc b/examples/widgets/doc/src/imagecomposition.qdoc
index 10f3ea9c36..97f3a78264 100644
--- a/examples/widgets/doc/src/imagecomposition.qdoc
+++ b/examples/widgets/doc/src/imagecomposition.qdoc
@@ -29,6 +29,7 @@
     \example painting/imagecomposition
     \title Image Composition Example
     \ingroup examples-painting
+    \ingroup examples-layout
     \brief Shows how composition modes work in QPainter.
 
     \brief The Image Composition example lets the user combine images
diff --git a/examples/widgets/doc/src/menus.qdoc b/examples/widgets/doc/src/menus.qdoc
index 77eef6c5c2..0cf74a7dac 100644
--- a/examples/widgets/doc/src/menus.qdoc
+++ b/examples/widgets/doc/src/menus.qdoc
@@ -29,6 +29,7 @@
     \example mainwindows/menus
     \title Menus Example
     \ingroup examples-mainwindow
+    \ingroup examples-layout
 
     \brief The Menus example demonstrates how menus can be used in a main
     window application.
diff --git a/examples/widgets/doc/src/simpletreemodel.qdoc b/examples/widgets/doc/src/simpletreemodel.qdoc
index 46a429d16b..a50197b04d 100644
--- a/examples/widgets/doc/src/simpletreemodel.qdoc
+++ b/examples/widgets/doc/src/simpletreemodel.qdoc
@@ -29,6 +29,7 @@
     \example itemviews/simpletreemodel
     \title Simple Tree Model Example
     \ingroup examples-itemviews
+    \ingroup examples-layout
     \brief The Simple Tree Model example shows how to use a hierarchical model
     with Qt's standard view classes.
 
diff --git a/examples/widgets/doc/src/sub-attaq.qdoc b/examples/widgets/doc/src/sub-attaq.qdoc
index f09c5ff3a1..994e9d6f90 100644
--- a/examples/widgets/doc/src/sub-attaq.qdoc
+++ b/examples/widgets/doc/src/sub-attaq.qdoc
@@ -28,6 +28,7 @@
 /*!
     \example animation/sub-attaq
     \title Sub-Attaq
+    \ingroup examples-layout
 
     \brief This example shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
     and \l{The State Machine Framework}{the state machine framework} to create a game.