aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-11-04 12:52:37 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-11-05 09:00:44 +0100
commitc01ad45d67ec0ce96d6944496dc292a94f17efea (patch)
tree537b4b7db2bf2d9be7f55ac8139dddfd06f911b1 /src/qml/qml
parent9eea418e1a13e0cee239903103dbccb83e936c40 (diff)
Doc:: Fix documentation warnings for Qt QML
Task-number: QTBUG-88156 Change-Id: Ic6127c6128b4c7736cb4b5ab8ce51629388b59ca Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqml.cpp4
-rw-r--r--src/qml/qml/qqmlengine.cpp2
-rw-r--r--src/qml/qml/qqmllist.cpp5
-rw-r--r--src/qml/qml/qqmllocale.cpp2
4 files changed, 7 insertions, 6 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp
index 56a0595e0e..20608a60e4 100644
--- a/src/qml/qml/qqml.cpp
+++ b/src/qml/qml/qqml.cpp
@@ -110,11 +110,11 @@ static QTypeRevision resolveModuleVersion(int moduleMajor)
*/
/*!
- * Registers an implicit import for module \a uri of major version \a majorVersion
+ * Registers an implicit import for module \a uri of major version \a majorVersion.
*
* This has the same effect as an \c import statement in a qmldir file: Whenever
* \a uri of version \a moduleMajor is imported, \a import of version
- * \a importMajor.\a importMinor is automatically imported, too. If
+ * \a importMajor. \a importMinor is automatically imported, too. If
* \a importMajor is \l QmlModuleImportLatest the latest version
* available of that module is imported, and \a importMinor does not matter. If
* \a importMinor is \l QmlModuleImportLatest the latest minor version of a
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 588ccea11c..c41c1d9a54 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -543,7 +543,7 @@ The following functions are also on the Qt object.
\li application.font
\endlist
- \sa Screen, Window, {QtQuick.Window::Window::screen}{Window.screen}
+ \sa Screen, Window, {Window::screen}{Window.screen}
*/
/*!
diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp
index a0d34cbce7..887fe66bc1 100644
--- a/src/qml/qml/qqmllist.cpp
+++ b/src/qml/qml/qqmllist.cpp
@@ -648,8 +648,9 @@ Remove the last element from the list \a property.
/*!
\fn bool QQmlListReference::operator==(const QQmlListReference &other) const
-Compares two QQmlListReferences. They are only considered equal if one was
-created from the other via copy assignment or copy construction.
+Compares this QQmlListReference to \a other, and returns \c true if they are
+equal. The two are only considered equal if one was created from the other
+via copy assignment or copy construction.
\note Independently created references to the same object are not considered
to be equal.
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 5109574654..8f11bc248d 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -731,7 +731,7 @@ V4_DEFINE_EXTENSION(QV4LocaleDataDeletable, localeV4Data);
/*!
\qmltype Locale
- \instantiates QQmlLocale
+ //! \instantiates QQmlLocale
\inqmlmodule QtQml
\brief Provides locale specific properties and formatted data.