diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 21:36:34 (GMT) |
| commit | 6470f646d0815f67bab507c1362cdda775c42a6e (patch) | |
| tree | 6389ca2728ec8b78294af60e20b918fdccdf88f1 /doc/src | |
| parent | 50f400ac20e918db1d0a6496003d953dedaba42a (diff) | |
| parent | 3bd0062535aaa991fadf739f9362851afacb19eb (diff) | |
| download | Qt-6470f646d0815f67bab507c1362cdda775c42a6e.zip Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.gz Qt-6470f646d0815f67bab507c1362cdda775c42a6e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/properties.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_properties.qdoc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc index 1aa41a9..b7f773a 100644 --- a/doc/src/properties.qdoc +++ b/doc/src/properties.qdoc @@ -128,6 +128,11 @@ constant value may be different for different instances of the object. A constant property cannot have a \c WRITE method or a \c NOTIFY signal. + \o The presence of the \c FINAL attribute indicates that the property + will not be overridden by a derived class. This can be used for performance + optimizations in some cases, but is not enforced by moc. Care must be taken + never to override a \c FINAL property. + \endlist The \c READ, \c WRITE, and \c RESET functions can be inherited. diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc index 64e5377..3c9109f 100644 --- a/doc/src/snippets/code/doc_src_properties.qdoc +++ b/doc/src/snippets/code/doc_src_properties.qdoc @@ -8,7 +8,8 @@ Q_PROPERTY(type name [SCRIPTABLE bool] [STORED bool] [USER bool] - [CONSTANT]) + [CONSTANT] + [FINAL]) //! [0] |