diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-16 11:33:41 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-07 21:23:55 +0100 |
| commit | f64694647a9a3d54fa5ecdaf2570e8c7404271a6 (patch) | |
| tree | 18a98362d72b210c7672084687b052888faeb053 /src/corelib/doc/src | |
| parent | 0eb922a4e99da83f5600d36510668dfa002a17aa (diff) | |
moc: Extend revision markers to allow for major and minor version
As we want Qt's own revisions to follow the Qt versioning scheme, we
need to allow for the minor version to reset to 0 now. In order to
facilitate this, we interpret the argument passed the current Q_REVISION
macro as major version and allow for an optional minor version. Both are
encoded it into the resulting revision number.
Change-Id: I3519fe20233d473f34a24ec9589d045cdd162a12
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/doc/src')
| -rw-r--r-- | src/corelib/doc/src/objectmodel/properties.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 680e5598f0..abeb9b7a54 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -102,8 +102,8 @@ re-evaluated in QML, for example. Qt emits automatically that signal when needed for MEMBER properties that do not have an explicit setter. - \li A \c REVISION number is optional. If included, it defines - the property and its notifier signal to be used in a particular + \li A \c REVISION number or \c REVISION() macro is optional. If included, + it defines the property and its notifier signal to be used in a particular revision of the API (usually for exposure to QML). If not included, it defaults to 0. |