Merge remote-tracking branch 'origin/5.11' into 5.12

Change-Id: I5582a012cd838148e1df0636b98dac054a9a7186

Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I5582a012cd838148e1df0636b98dac054a9a7186
4e8a591a · Qt Forward Merge Bot · 371c0e83 · f1cf2c56 · 4e8a591a
Commit 4e8a591a authored 6 years ago by Qt Forward Merge Bot
--- a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc
+++ b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc
@@ -56,7 +56,7 @@
    name. The widget is also shown explicitly.
    \snippet activeqt/hierarchy/objects.cpp 2
-    The \c subWidget slot uses the \c QObject::child() function and
+    The \c subWidget slot uses the \c QObject::findChild() function and
    returns the first child of type \c QSubWidget that has the requested
    name.