diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:04:17 +0200 |
| commit | f7837e28b5f83d116fa43d0401b7188ce27fc346 (patch) | |
| tree | 3de2560e4259f22224f334be17618386860decc7 /examples/widgets/doc | |
| parent | 8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff) | |
| parent | 44a58de2aea6d2ac71efe7261a398effbf139f3f (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/concurrent/qtconcurrentmedian.h
src/corelib/itemmodels/qabstractitemmodel.cpp
Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
Diffstat (limited to 'examples/widgets/doc')
| -rw-r--r-- | examples/widgets/doc/src/echoplugin.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc index 2c56a2f53b..9e2b0c35de 100644 --- a/examples/widgets/doc/src/echoplugin.qdoc +++ b/examples/widgets/doc/src/echoplugin.qdoc @@ -145,7 +145,7 @@ plugin. The Q_INTERFACES macro tells Qt which interfaces the class implements. In our case we only implement the \c EchoInterface. If a class implements more than one interface, they are given as - a comma separated list. The Q_PLUGIN_METADATA macro is included next + a space separated list. The Q_PLUGIN_METADATA macro is included next to the Q_OBJECT macro. It contains the plugins IID and a filename pointing to a json file containing the metadata for the plugin. The json file is compiled into the plugin and does not need to be installed. |