diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2013-07-09 16:06:55 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-10 17:56:51 +0200 |
commit | e07bdb8f7401f207a1637d2c2efd299db31756ed (patch) | |
tree | 6ce7bbcff0e3645b27ecbb6feaac50406dcfd9eb /src/corelib | |
parent | af19cbc8f33af933a3a4e2d16daac84acbad94be (diff) |
Doc: Uniformize the syntax description of Q_PROPERTY
In the qobject.html page, the description of the syntax of Q_PROPERTY
does not include the MEMBER keyword added in Qt 5.1.
But it was well documented in the documentation of the property system.
Merge the two code snipppets.
Task-number: QTBUG-32211
Change-Id: I7b57329c201b6f3bc812155f21dbfb2c6423494e
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp | 17 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp index 68df53e0da..6a2305cc85 100644 --- a/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_kernel_qobject.cpp @@ -367,23 +367,6 @@ public: }; //! [35] - -//! [36] -Q_PROPERTY(type name - READ getFunction - [WRITE setFunction] - [RESET resetFunction] - [NOTIFY notifySignal] - [REVISION int] - [DESIGNABLE bool] - [SCRIPTABLE bool] - [STORED bool] - [USER bool] - [CONSTANT] - [FINAL]) -//! [36] - - //! [37] Q_PROPERTY(QString title READ title WRITE setTitle USER true) //! [37] diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index d4d2d527d4..02794e9fe3 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3921,7 +3921,7 @@ QDebug operator<<(QDebug dbg, const QObject *o) { they have additional features accessible through the \l {Meta-Object System}. - \snippet code/src_corelib_kernel_qobject.cpp 36 + \snippet code/doc_src_properties.cpp 0 The property name and type and the \c READ function are required. The type can be any type supported by QVariant, or it can be a |