diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:04 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-05 10:44:48 +0100 |
commit | d51abed57a8f677a0d4eac57fd3f16bd4662190a (patch) | |
tree | b3e173db4b72edbff6cb8dcc203c3d4526a1b51b /doc/src/corelib/objectmodel/metaobjects.qdoc | |
parent | 07ae18f96e87a2db40ae014f28893f1080efa7ae (diff) | |
parent | 0862d7f78af978cf513097b3bdc33cd8096dee75 (diff) |
Merge remote-tracking branch 'origin/master' into api_changes
Change-Id: Ibcb1f7070f50968b77b66112750ce5c70fc0b6d0
Diffstat (limited to 'doc/src/corelib/objectmodel/metaobjects.qdoc')
-rw-r--r-- | doc/src/corelib/objectmodel/metaobjects.qdoc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/corelib/objectmodel/metaobjects.qdoc b/doc/src/corelib/objectmodel/metaobjects.qdoc index 7edb376e25..c92f6f2f09 100644 --- a/doc/src/corelib/objectmodel/metaobjects.qdoc +++ b/doc/src/corelib/objectmodel/metaobjects.qdoc @@ -41,12 +41,12 @@ The meta-object system is based on three things: \list 1 - \o The \l QObject class provides a base class for objects that can + \li The \l QObject class provides a base class for objects that can take advantage of the meta-object system. - \o The Q_OBJECT macro inside the private section of the class + \li The Q_OBJECT macro inside the private section of the class declaration is used to enable meta-object features, such as dynamic properties, signals, and slots. - \o The \l{moc}{Meta-Object Compiler} (\c moc) supplies each + \li The \l{moc}{Meta-Object Compiler} (\c moc) supplies each QObject subclass with the necessary code to implement meta-object features. \endlist @@ -64,19 +64,19 @@ additional features: \list - \o QObject::metaObject() returns the associated + \li QObject::metaObject() returns the associated \l{QMetaObject}{meta-object} for the class. - \o QMetaObject::className() returns the class name as a + \li QMetaObject::className() returns the class name as a string at run-time, without requiring native run-time type information (RTTI) support through the C++ compiler. - \o QObject::inherits() function returns whether an object is an + \li QObject::inherits() function returns whether an object is an instance of a class that inherits a specified class within the QObject inheritance tree. - \o QObject::tr() and QObject::trUtf8() translate strings for + \li QObject::tr() and QObject::trUtf8() translate strings for \l{Internationalization with Qt}{internationalization}. - \o QObject::setProperty() and QObject::property() + \li QObject::setProperty() and QObject::property() dynamically set and get properties by name. - \o QMetaObject::newInstance() constructs a new instance of the class. + \li QMetaObject::newInstance() constructs a new instance of the class. \endlist \target qobjectcast |