diff options
| author | Jonas Kvinge <jonas@jkvinge.net> | 2021-10-09 14:52:31 +0200 |
|---|---|---|
| committer | Jonas Kvinge <jonas@jkvinge.net> | 2021-10-12 12:52:02 +0200 |
| commit | 18e1711f7a6b240bde9b8dc5366394c9b01b3a7f (patch) | |
| tree | f68883738aa9af198ca2de5bb2e83148759acdd1 /src/corelib/doc | |
| parent | 231fec7ca2f61da7d94c8aa072b41fd7ee893861 (diff) | |
corelib: Fix typos in documentation
Pick-to: 5.15 6.2
Change-Id: I64d63af708bc6ddaabd12450eb3089e5077f849e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/src/containers.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/objectmodel/bindableproperties.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/qt6-changes.qdoc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index 5d4b9a2215..1050223791 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -539,7 +539,7 @@ If you do not use Q_DECLARE_TYPEINFO, Qt will use \l {https://en.cppreference.com/w/cpp/types/is_trivial} {std::is_trivial_v<T>} - to indentify primitive + to identify primitive types and it will require both \l {https://en.cppreference.com/w/cpp/types/is_trivially_copyable} {std::is_trivially_copyable_v<T>} and diff --git a/src/corelib/doc/src/objectmodel/bindableproperties.qdoc b/src/corelib/doc/src/objectmodel/bindableproperties.qdoc index 5c9685656a..dc83c01e3d 100644 --- a/src/corelib/doc/src/objectmodel/bindableproperties.qdoc +++ b/src/corelib/doc/src/objectmodel/bindableproperties.qdoc @@ -191,7 +191,7 @@ } \endcode - All the common rules and recomendations regarding writing to bindable + All the common rules and recommendations regarding writing to bindable properties also apply here. As soon as the base class implementation is called, all the observers are notified about the change to the property. This means that class invariants must be met before calling the base diff --git a/src/corelib/doc/src/qt6-changes.qdoc b/src/corelib/doc/src/qt6-changes.qdoc index b443346ccd..b12e127cc6 100644 --- a/src/corelib/doc/src/qt6-changes.qdoc +++ b/src/corelib/doc/src/qt6-changes.qdoc @@ -518,7 +518,7 @@ \li \c QVariant::isNull() now only returns \c true if the \c QVariant is empty or contains a \c nullptr. In Qt 5, it also returned true for classes in qtbase which had an \c isNull method themselves if that one returned true. Code relying on the old behavior needs to check whether - the contained value returs isNull – however such code is unlikely to occur in practice, as + the contained value returns isNull – however such code is unlikely to occur in practice, as \c isNull() is rarely the property one is interested in (compare \c QString::isEmpty() / \c isNull() and \c QTime::isValid / \c isNull). |