diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 09:12:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-24 09:12:41 (GMT) |
| commit | 31aab590f1c14ef1aaa2742cd2a369465c48aa2f (patch) | |
| tree | 2992dd868b3ae491961da535c48cb85b4507f29e /doc/src | |
| parent | 0067b1fd6ce3abb2600de9567039fd9710b176d2 (diff) | |
| parent | 6536f950bb4eb21f769086a9e95bb76e81a39e3c (diff) | |
| download | Qt-31aab590f1c14ef1aaa2742cd2a369465c48aa2f.zip Qt-31aab590f1c14ef1aaa2742cd2a369465c48aa2f.tar.gz Qt-31aab590f1c14ef1aaa2742cd2a369465c48aa2f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix few declarative code issues discovered by static code analysis
Use SpringAnimation in relevant examples again.
Fix crach in synchronization of ListModel in WorkerThread.
Enable mouse text selection in searchbox example
Make QML tests compile on OpenSolaris
Document QML_DECLARE_TYPEINFO
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) |