Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: Iefe01912d41638b88f64543d63107f6dcec97366

3 files changed, 23 insertions, 19 deletions

diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 70a0352e..50557ccf 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -106,6 +106,7 @@
         \li \l{modelview.html}{Model-View}
         \li \l{Item Views Examples}
         \li \l{Main Window Examples}
+        \li \l{Layout Examples}
         \endlist
         \list
         \li \l{Qt Widgets Examples}{See more}
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 52878139..344a45c2 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -39,21 +39,22 @@
 
     \image layout-examples.png
 
-    Qt uses a layout-based approach to widget management. Widgets are arranged in
-    the optimal positions in windows based on simple layout rules, leading to a
-    consistent look and feel.
+    Qt uses a layout-based approach to widget management. Widgets are arranged
+    in the optimal positions in windows based on simple layout rules, leading to
+    a consistent look and feel. Custom layouts provide more control over the
+    positions and sizes of child widgets.
 
-    Custom layouts can be used to provide more control over the positions and
-    sizes of child widgets.
+    These \l{Qt Examples and Tutorials}{Qt Examples} demonstrate various
+    ways of setting widgets in layouts.
 
     \list
-    \li \l{layouts/basiclayouts}{Basic Layouts}\raisedaster
-    \li \l{layouts/borderlayout}{Border Layout}
-    \li \l{layouts/dynamiclayouts}{Dynamic Layouts}
-    \li \l{layouts/flowlayout}{Flow Layout}
+    \li \l{Basic Layouts Example}{Basic Layouts}
+    \li \l{Border Layout Example}{Border Layout}
+    \li \l{Dynamic Layouts Example}{Dynamic Layouts}
+    \li \l{Flow Layout Example}{Flow Layout}
     \endlist
 
-    Examples marked with an asterisk (*) are fully documented.
+    \sa {Layout Management}
 */
 
 /*!
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index a15b8390..a69d0292 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -103,17 +103,19 @@ If we save that document as "HelloWorld.qml", we can load and display it.
 \section1 Loading and Displaying the QML Document
 
 To display the graphical scene defined by the QML document, it may be loaded
-with the \l{Prototyping with qmlscene}{qmlscene} tool. The
-\l{Prototyping with qmlscene}{qmlscene} tool should be installed into the
-Qt installation directory. Assuming that the Qt binaries are installed into
-or are available in the system executable path, you can display the QML
-document with the following command:
+with \l{Qt Creator Manual}{Qt Creator}. For simple UI files such as this one,
+select \gui{File > New File or Project > Applications > Qt Quick UI} from
+within Qt Creator.
 
-\code
-qmlscene HelloWorld.qml
-\endcode
+Pressing the green \gui{Run} button runs the application. You should see the
+text \gui{Hello, World!} in the center of a red rectangle.
 
-You should see the text "Hello, World!" in the center of a red rectangle.
+For more information about creating and running projects in Qt Creator, visit
+the following pages:
+\list
+\li \l{Qt Creator: Creating Qt Quick Projects}{Creating Qt Quick Projects}
+\li \l{Qt Creator: Building and Running an Example}{Building and Running an Example}
+\endlist
 
 \section1 Handling User Input