diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-16 08:50:06 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-16 08:50:06 (GMT) |
| commit | 048e0ba0be9c6aec608706e15eda040f7219c420 (patch) | |
| tree | b8dfa3ef1c6be0a62e7783ce988a30b0633be68a /doc/src/snippets | |
| parent | 8c942f6d2998ffcd024437e408f92d38750dd025 (diff) | |
| parent | 13ca61fcfdc53a6a06ae6f409ae0d9e17919336c (diff) | |
| download | Qt-048e0ba0be9c6aec608706e15eda040f7219c420.zip Qt-048e0ba0be9c6aec608706e15eda040f7219c420.tar.gz Qt-048e0ba0be9c6aec608706e15eda040f7219c420.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/src_corelib_kernel_qobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 2d86f8c..77c67ab 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -374,10 +374,13 @@ Q_PROPERTY(type name READ getFunction [WRITE setFunction] [RESET resetFunction] + [NOTIFY notifySignal] [DESIGNABLE bool] [SCRIPTABLE bool] [STORED bool] - [USER bool]) + [USER bool] + [CONSTANT] + [FINAL]) //! [36] |