diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:27:14 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:27:14 +0100 |
commit | 46bb36f983fc503d36b5ff9d31677153d4aa8086 (patch) | |
tree | ef3977d0bdb11777e5e1be9e18fb803c9b2ab5aa /src/qml/doc/src/modules/cppplugins.qdoc | |
parent | 969dc839c3b0028e821d15015f99bd70d76fbc03 (diff) | |
parent | f7ada9b9325c7adc10da6a3a4e7f887452682260 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I324152dc6eec44e4f5524ff87b136f0ae20635c0
Diffstat (limited to 'src/qml/doc/src/modules/cppplugins.qdoc')
-rw-r--r-- | src/qml/doc/src/modules/cppplugins.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/modules/cppplugins.qdoc b/src/qml/doc/src/modules/cppplugins.qdoc index a5fbafbdfc..af2a36c903 100644 --- a/src/qml/doc/src/modules/cppplugins.qdoc +++ b/src/qml/doc/src/modules/cppplugins.qdoc @@ -65,7 +65,7 @@ \section1 Plugin Example Suppose there is a new \c TimeModel C++ class that should be made available - as a new QML element. It provides the current time through \c hour and \c minute + as a new QML type. It provides the current time through \c hour and \c minute properties. \snippet qml/plugins/plugin.cpp 0 |