diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-06 03:00:43 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-06 03:00:43 +0100 |
| commit | 4e8a591aa95c7a60ddd3713ced11dd8b2db9098c (patch) | |
| tree | bb6478ba65a9ed4aadcde7127dd20fb94b131bf8 | |
| parent | 371c0e8389cebc5bd4e9726c31596ad3b56b33fc (diff) | |
| parent | f1cf2c56c8dbf79e478a3e0a8f3d19032aa44d3a (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I5582a012cd838148e1df0636b98dac054a9a7186
| -rw-r--r-- | examples/activeqt/hierarchy/doc/src/hierarchy.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc index 0b88a06..f618729 100644 --- 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. |