diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:04 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 18:18:53 +0100 |
| commit | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (patch) | |
| tree | 1c3dec7b83ebd2bef910075889dc2c39697933ea /src/qml/doc/src | |
| parent | a9bef84675f6b67bb88a2bb99e45aba889795251 (diff) | |
| parent | 2f9099443d9acd6583e92785afbb38b2e4dcbfd5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ied8d65aaf57e897a3dbc4df100744a594e8ee2cf
Diffstat (limited to 'src/qml/doc/src')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc b/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc index 7ac1d400eb..b5fe941f9f 100644 --- a/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/cppplugins.qdoc @@ -34,8 +34,9 @@ The \l{QQmlEngine}{QML engine} load C++ plugins for QML. Such plugins are usually provided in a QML extension module, and can - provide types and functionality for use by clients in QML documents - which import the module. + provide types for use by clients in QML documents which import the module. + A module requires at least one type registered in order to be considered + valid. QQmlExtensionPlugin is a plugin interface that makes it possible to create QML extensions that can be loaded dynamically into QML applications. |