diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 01:09:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 01:09:43 (GMT) |
| commit | fb44c5b866da71fcbe992f6d02fb18ab2470ac53 (patch) | |
| tree | 623e17472f0c66fad045fefe492ed0d9d288be4c | |
| parent | d3d2a48cc3a65596ce54ac443de3c04fe84b9621 (diff) | |
| parent | d397b62f9cb560e772fb0ba78b6a0af6c7232e33 (diff) | |
| download | Qt-fb44c5b866da71fcbe992f6d02fb18ab2470ac53.zip Qt-fb44c5b866da71fcbe992f6d02fb18ab2470ac53.tar.gz Qt-fb44c5b866da71fcbe992f6d02fb18ab2470ac53.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc
| -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] |