diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 01:57:39 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 01:57:39 (GMT) |
| commit | 2ff32c1b3b9ffbb6bf44b86f91e6e85b2f2ea434 (patch) | |
| tree | 4d54ba4590da8db8995f7497e43ff6ca2feeed8f /doc | |
| parent | ca34e4ca836e65ceef7581c4f156aa98f09e268f (diff) | |
| parent | 101c748b14f085a49dd565633ad4b12831a39556 (diff) | |
| download | Qt-2ff32c1b3b9ffbb6bf44b86f91e6e85b2f2ea434.zip Qt-2ff32c1b3b9ffbb6bf44b86f91e6e85b2f2ea434.tar.gz Qt-2ff32c1b3b9ffbb6bf44b86f91e6e85b2f2ea434.tar.bz2 | |
Merge branch 'master' of /Users/akennedy/Qt/qt into kinetic-declarativeui
Conflicts:
doc/src/properties.qdoc
src/corelib/kernel/kernel.pri
src/corelib/kernel/qguard_p.h
src/corelib/kernel/qobject.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/properties.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc index b7f773a..2d03e91 100644 --- a/doc/src/properties.qdoc +++ b/doc/src/properties.qdoc @@ -123,10 +123,10 @@ gets and sets a widget's \c USER property. \o The presence of the \c CONSTANT attibute indicates that the property - value is constant. For a given object instance, the \c READ method of a + value is constant. For a given object instance, the READ method of a constant property must return the same value every time it is called. This 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. + constant property cannot have a WRTE method or a 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 |