diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-08-25 02:53:34 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-08-25 02:53:34 (GMT) |
| commit | 87bc302810b97bd647187e5e31f5276ae729dce0 (patch) | |
| tree | 373b08bdb7cf513b95299e854399b7e3bde289ad /doc/src | |
| parent | e566660e222ea194c97c19c26dcb69b5d29ea90c (diff) | |
| parent | e141cb25e57b40af839abf872f65895724a39e88 (diff) | |
| download | Qt-87bc302810b97bd647187e5e31f5276ae729dce0.zip Qt-87bc302810b97bd647187e5e31f5276ae729dce0.tar.gz Qt-87bc302810b97bd647187e5e31f5276ae729dce0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/qtdeclarative.qdoc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc index b4f4c83..f163a66 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/doc/src/declarative/qtdeclarative.qdoc @@ -59,6 +59,16 @@ Equivalent to Q_DECLARE_METATYPE(TYPE) and Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>) */ +/*! + \macro QML_DECLARE_TYPEINFO(Type,Flags) + \relates QDeclarativeEngine + + Declares additional properties of a type. + + Current the only supported type info is \c QML_HAS_ATTACHED_PROPERTIES which + declares that the \c Type supports \l {Attached Properties}. +*/ + /*! \fn int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName) |