diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
| commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
| tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /examples/widgets/doc/src/echoplugin.qdoc | |
| parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
| parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'examples/widgets/doc/src/echoplugin.qdoc')
| -rw-r--r-- | examples/widgets/doc/src/echoplugin.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
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. |