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>
This commit is contained in:
parent
af19cbc8f3
commit
e07bdb8f74
@ -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]
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user