diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-18 09:58:57 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-18 09:58:57 +0100 |
| commit | ba9ca0e3d64c46fc63cdbc62f3e4a96e36a842f8 (patch) | |
| tree | f9631624c841281302a2a546fbcc06a2375f410e /src/qml/doc | |
| parent | a65b8785621ebf58f34eb0c1759376fc0a1117c7 (diff) | |
| parent | 464bd2bf975797241213191a374e70431c5c3763 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/jsruntime/qv4functionobject.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc index c89d4a3c0d..88c866baf3 100644 --- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc @@ -27,7 +27,7 @@ /*! \page qtqml-modules-qmldir.html \title Module Definition qmldir Files -\brief How to write a qmldir file which defines a QML module +\brief Defines a QML module There are two distinct types of \c qmldir files: \list @@ -177,6 +177,18 @@ plugin <Name> [<Path>] \code plugin MyPluginLibrary \endcode + \row + \li C++ Plugin Class + \li + \code + classname <C++ plugin class> + \endcode + \li Provides the class name of the C++ plugin used by the module. + + This information is required for all the QML modules that depend + on a C++ plugin for additional functionality. Qt Quick applications + built with static linking cannot resolve the module imports without + this information. \row \li Type Information Description File Declaration |