diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-10 14:35:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-10 14:35:09 (GMT) |
| commit | 0ef0b1acb84d216bddd31424849aba82d4ef51f9 (patch) | |
| tree | d536566ab05ad3ad3174a0bcd9e86ea09e53d604 | |
| parent | 724d7721331b444a6dd817cd4e12909a2cae709a (diff) | |
| parent | a4b6a5ccf5146dc5fbe2b8363b4c6fb73a8d975e (diff) | |
| download | Qt-0ef0b1acb84d216bddd31424849aba82d4ef51f9.zip Qt-0ef0b1acb84d216bddd31424849aba82d4ef51f9.tar.gz Qt-0ef0b1acb84d216bddd31424849aba82d4ef51f9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index d43c5dd..f153c7e 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2488,6 +2488,7 @@ bool QMetaProperty::isUser(const QObject *object) const } /*! + \since 4.6 Returns true if the property is constant; otherwise returns false. A property is constant if the \c{Q_PROPERTY()}'s \c CONSTANT attribute @@ -2502,6 +2503,7 @@ bool QMetaProperty::isConstant() const } /*! + \since 4.6 Returns true if the property is final; otherwise returns false. A property is final if the \c{Q_PROPERTY()}'s \c FINAL attribute diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 21a686e..51e767c 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -353,6 +353,7 @@ QT_BEGIN_NAMESPACE /*! \macro QBENCHMARK_ONCE + \since 4.6 \relates QTest |