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

Conflicts:
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quickwidgets/qquickwidget.cpp
	tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp

Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611

3 files changed, 4 insertions, 4 deletions

diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
index 1b6e7dc539..20a6d131f5 100644
--- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
+++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
@@ -84,7 +84,7 @@
     stretches horizontally. The azure rectangle can be resized from 50x150 to 300x150, and the plum
     rectangle can be resized from 100x100 to ∞x100.
 
-    \snippet windowconstraints.qml rowlayout
+    \snippet qml/windowconstraints.qml rowlayout
 
     \image rowlayout-minimum.png "RowLayout at its minimum"
 
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index 7d0a0826a6..c820e08e1b 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -186,7 +186,7 @@ dedicated thread. Qt attempts to choose a suitable loop based on the
 platform and possibly the graphics drivers in use. When this is not
 satisfactory, or for testing purposes, the environment variable
 \c QSG_RENDER_LOOP can be used to force the usage of a given loop. To
-verify which render loop is in use, enable the \c qt.scenegraph.info
+verify which render loop is in use, enable the \c qt.scenegraph.general
 \l {QLoggingCategory}{logging category}.
 
 \note The \c threaded and \c windows render loops rely on the OpenGL
@@ -374,7 +374,7 @@ addition to being helpful to Qt contributors.
 
 \li \c {qt.scenegraph.time.glyph} - logs the time spent preparing distance field glyphs
 
-\li \c {qt.scenegraph.info} - logs general information about various parts of the scene graph and the graphics stack
+\li \c {qt.scenegraph.general} - logs general information about various parts of the scene graph and the graphics stack
 
 \li \c {qt.scenegraph.renderloop} - creates a detailed log of the various stages involved in rendering. This log mode is primarily useful for developers working on Qt.
 
diff --git a/src/quick/doc/src/examples.qdoc b/src/quick/doc/src/examples.qdoc
index e69c2f6551..e41b472ee1 100644
--- a/src/quick/doc/src/examples.qdoc
+++ b/src/quick/doc/src/examples.qdoc
@@ -135,7 +135,7 @@ Creator.
     \div {class="doc-column"}
         \b{Layouts and Views}
         \list
-        \li \l{Qt Quick Controls - Basic Layouts Example}{Basic Layouts}
+        \li \l{Qt Quick Layouts - Basic Example}
         \li \l{Qt Quick Examples - Positioners}{Positioners}
         \li \l{Qt Quick Examples - Views}{Views}
         \li \l{Qt Quick Examples - Window and Screen}{Windows and Screen}