Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5

16 files changed, 181 insertions, 114 deletions

diff --git a/src/qml/qml/ftw/qintrusivelist.cpp b/src/qml/qml/ftw/qintrusivelist.cpp
index eb337a4de0..2ebaffb375 100644
--- a/src/qml/qml/ftw/qintrusivelist.cpp
+++ b/src/qml/qml/ftw/qintrusivelist.cpp
@@ -150,6 +150,10 @@ Returns an STL-style iterator pointing to the imaginary item after the last item
 Remove the current object from the list, and return an iterator to the next element.
 */
 
+/*!
+    \class QIntrusiveListNode
+    \internal
+*/
 
 /*!
 \fn QIntrusiveListNode::QIntrusiveListNode()
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h
index effa05180d..ae3893dd73 100644
--- a/src/qml/qml/qqml.h
+++ b/src/qml/qml/qqml.h
@@ -168,11 +168,13 @@ int qmlRegisterAnonymousType(const char *uri, int versionMajor)
     return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type);
 }
 
+#if QT_DEPRECATED_SINCE(5, 14)
 template<typename T>
 QT_DEPRECATED_VERSION_X_5_14("Use qmlRegisterAnonymousType instead") int qmlRegisterType()
 {
     return qmlRegisterAnonymousType<T>("", 1);
 }
+#endif
 
 int Q_QML_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
 
@@ -621,8 +623,10 @@ namespace QtQml {
     Q_QML_EXPORT QQmlContext *qmlContext(const QObject *);
     Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *);
 #if QT_DEPRECATED_SINCE(5, 14)
-    Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-    Q_QML_EXPORT QT_DEPRECATED QObject *qmlAttachedPropertiesObject(
+    Q_QML_EXPORT QT_DEPRECATED_VERSION_X_5_14("Use qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc, bool")
+    QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
+    Q_QML_EXPORT QT_DEPRECATED_VERSION_X_5_14("Use qmlAttachedPropertiesObject(QObject *, QQmlAttachedPropertiesFunc, bool")
+    QObject *qmlAttachedPropertiesObject(
             int *, const QObject *, const QMetaObject *, bool create);
 #endif
     Q_QML_EXPORT QQmlAttachedPropertiesFunc qmlAttachedPropertiesFunction(QObject *,
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp
index d04a89b514..adb036e2d0 100644
--- a/src/qml/qml/qqmlapplicationengine.cpp
+++ b/src/qml/qml/qqmlapplicationengine.cpp
@@ -279,7 +279,7 @@ void QQmlApplicationEngine::load(const QString &filePath)
 }
 
 /*!
-   Sets the initial properties with which the QML component gets initialized after
+   Sets the \a initialProperties with which the QML component gets initialized after
    it gets loaded.
 
 
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index d651cbf636..f03f90e7f3 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -827,8 +827,9 @@ QObject *QQmlComponent::create(QQmlContext *context)
 }
 
 /*!
-    Create an object instance of this component, and initialize its toplevel properties according to initalPropertyValues.
-
+    Create an object instance of this component, and initialize its toplevel
+    properties with \a initialProperties. \a context specifies the context
+    where the object instance is to be created.
 
     \sa QQmlComponent::create
     \since 5.14
@@ -1178,7 +1179,7 @@ void QQmlComponent::create(QQmlIncubator &incubator, QQmlContext *context,
 }
 
 /*!
-   Set toplevel properties of the component.
+   Set toplevel \a properties of the \a component.
 
 
    This method provides advanced control over component instance creation.
diff --git a/src/qml/qml/qqmldatablob_p.h b/src/qml/qml/qqmldatablob_p.h
index da3bbe2c1f..0450e94c02 100644
--- a/src/qml/qml/qqmldatablob_p.h
+++ b/src/qml/qml/qqmldatablob_p.h
@@ -242,7 +242,9 @@ private:
     mutable QString m_finalUrlString;
 
     // List of QQmlDataBlob's that are waiting for me to complete.
+protected:
     QList<QQmlDataBlob *> m_waitingOnMe;
+private:
 
     // List of QQmlDataBlob's that I am waiting for to complete.
     QVector<QQmlRefPointer<QQmlDataBlob>> m_waitingFor;
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index 96891af416..3c540a6124 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
     \endcode
 */
 #define qmlobject_connect(Sender, SenderType, Signal, Receiver, ReceiverType, Method) \
-{ \
+do { \
     SenderType *sender = (Sender); \
     ReceiverType *receiver = (Receiver); \
     const char *signal = (Signal); \
@@ -111,7 +111,7 @@ QT_BEGIN_NAMESPACE
     } \
     Q_ASSERT(signalIdx != -1 && methodIdx != -1); \
     QMetaObject::connect(sender, signalIdx, receiver, methodIdx, Qt::DirectConnection); \
-}
+} while (0)
 
 /*!
     Disconnect \a Signal of \a Sender from \a Method of \a Receiver.  \a Signal must be
@@ -129,7 +129,7 @@ QT_BEGIN_NAMESPACE
     \endcode
 */
 #define qmlobject_disconnect(Sender, SenderType, Signal, Receiver, ReceiverType, Method) \
-{ \
+do { \
     SenderType *sender = (Sender); \
     ReceiverType *receiver = (Receiver); \
     const char *signal = (Signal); \
@@ -150,7 +150,7 @@ QT_BEGIN_NAMESPACE
     } \
     Q_ASSERT(signalIdx != -1 && methodIdx != -1); \
     QMetaObject::disconnect(sender, signalIdx, receiver, methodIdx); \
-}
+} while (0)
 
 /*!
     This method is identical to qobject_cast<T>() except that it does not require lazy
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 31a7004407..5feea9daa8 100644
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1751,6 +1751,16 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
 
     addImportPath(QStringLiteral("qrc:/qt-project.org/imports"));
     addImportPath(QCoreApplication::applicationDirPath());
+#if defined(Q_OS_ANDROID)
+    addImportPath(QStringLiteral("qrc:/android_rcc_bundle/qml"));
+    if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_BUNDLED_LIBS_PATH"))) {
+        const QString envImportPath = qEnvironmentVariable("QT_BUNDLED_LIBS_PATH");
+        QLatin1Char pathSep(':');
+        QStringList paths = envImportPath.split(pathSep, QString::SkipEmptyParts);
+        for (int ii = paths.count() - 1; ii >= 0; --ii)
+            addPluginPath(paths.at(ii));
+    }
+#endif
 }
 
 QQmlImportDatabase::~QQmlImportDatabase()
@@ -1798,6 +1808,18 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader,
         if (!resolvedPath.endsWith(Slash))
             resolvedPath += Slash;
 
+#if defined(Q_OS_ANDROID)
+        if (qmldirPath.size() > 25 && qmldirPath.at(0) == QLatin1Char(':') && qmldirPath.at(1) == QLatin1Char('/') &&
+           qmldirPath.startsWith(QStringLiteral(":/android_rcc_bundle/qml/"), Qt::CaseInsensitive)) {
+            QString pluginName = qmldirPath.mid(21) + Slash + baseName;
+            auto bundledPath = resolvedPath + QLatin1String("lib") + pluginName.replace(QLatin1Char('/'), QLatin1Char('_'));
+            for (const QString &suffix : suffixes) {
+                const QString absolutePath = typeLoader->absoluteFilePath(bundledPath + suffix);
+                if (!absolutePath.isEmpty())
+                    return absolutePath;
+            }
+        }
+#endif
         resolvedPath += prefix + baseName;
         for (const QString &suffix : suffixes) {
             const QString absolutePath = typeLoader->absoluteFilePath(resolvedPath + suffix);
diff --git a/src/qml/qml/qqmlinfo.cpp b/src/qml/qml/qqmlinfo.cpp
index 6322302422..2bfd2d5bb4 100644
--- a/src/qml/qml/qqmlinfo.cpp
+++ b/src/qml/qml/qqmlinfo.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QQmlInfo QtQml::qmlDebug(const QObject *object)
-    \relates QQmlEngine
+    \relates QtQml
     \since 5.9
 
     Prints debug messages that include the file and line number for the
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QQmlInfo QtQml::qmlInfo(const QObject *object)
-    \relates QQmlEngine
+    \relates QtQml
 
     Prints informational messages that include the file and line number for the
     specified QML \a object.
@@ -119,7 +119,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \fn QQmlInfo QtQml::qmlWarning(const QObject *object)
-    \relates QQmlEngine
+    \relates QtQml
     \since 5.9
 
     Prints warning messages that include the file and line number for the
diff --git a/src/qml/qml/qqmlmetatypedata.cpp b/src/qml/qml/qqmlmetatypedata.cpp
index 5dc0083f54..41a7778da3 100644
--- a/src/qml/qml/qqmlmetatypedata.cpp
+++ b/src/qml/qml/qqmlmetatypedata.cpp
@@ -69,6 +69,7 @@ void QQmlMetaTypeData::registerType(QQmlTypePrivate *priv)
         if (!types.at(i).isValid()) {
             types[i] = QQmlType(priv);
             priv->index = i;
+            priv->release();
             return;
         }
     }
diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index def4480198..94bf3cbdc3 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -152,9 +152,18 @@ inline QQmlJS::DiagnosticMessage QQmlPropertyCacheCreator<ObjectContainer>::buil
 template <typename ObjectContainer>
 inline QQmlJS::DiagnosticMessage QQmlPropertyCacheCreator<ObjectContainer>::buildMetaObjectRecursively(int objectIndex, const QQmlBindingInstantiationContext &context)
 {
+    auto isAddressable = [](const QUrl &url) {
+        const QString fileName = url.fileName();
+        return !fileName.isEmpty() && fileName.front().isUpper();
+    };
+
     const CompiledObject *obj = objectContainer->objectAt(objectIndex);
+    bool needVMEMetaObject = obj->propertyCount() != 0 || obj->aliasCount() != 0
+            || obj->signalCount() != 0 || obj->functionCount() != 0 || obj->enumCount() != 0
+            || (((obj->flags & QV4::CompiledData::Object::IsComponent)
+                 || (objectIndex == 0 && isAddressable(objectContainer->url())))
+                && !objectContainer->resolvedType(obj->inheritedTypeNameIndex)->isFullyDynamicType);
 
-    bool needVMEMetaObject = obj->propertyCount() != 0 || obj->aliasCount() != 0 || obj->signalCount() != 0 || obj->functionCount() != 0 || obj->enumCount() != 0;
     if (!needVMEMetaObject) {
         auto binding = obj->bindingsBegin();
         auto end = obj->bindingsEnd();
diff --git a/src/qml/qml/qqmlscriptblob.cpp b/src/qml/qml/qqmlscriptblob.cpp
index 69b26894a8..6ac30d3ab5 100644
--- a/src/qml/qml/qqmlscriptblob.cpp
+++ b/src/qml/qml/qqmlscriptblob.cpp
@@ -177,7 +177,7 @@ void QQmlScriptBlob::done()
     }
 
     if (!m_isModule) {
-        m_scriptData->typeNameCache = new QQmlTypeNameCache(m_importCache);
+        m_scriptData->typeNameCache.adopt(new QQmlTypeNameCache(m_importCache));
 
         QSet<QString> ns;
 
@@ -195,7 +195,7 @@ void QQmlScriptBlob::done()
             m_scriptData->typeNameCache->add(script.qualifier, scriptIndex, script.nameSpace);
         }
 
-        m_importCache.populateCache(m_scriptData->typeNameCache);
+        m_importCache.populateCache(m_scriptData->typeNameCache.data());
     }
     m_scripts.clear();
 }
diff --git a/src/qml/qml/qqmlscriptdata.cpp b/src/qml/qml/qqmlscriptdata.cpp
index 0725f40d2a..ae268ca904 100644
--- a/src/qml/qml/qqmlscriptdata.cpp
+++ b/src/qml/qml/qqmlscriptdata.cpp
@@ -156,11 +156,7 @@ QV4::ReturnedValue QQmlScriptData::scriptValueForContext(QQmlContextData *parent
 
 void QQmlScriptData::clear()
 {
-    if (typeNameCache) {
-        typeNameCache->release();
-        typeNameCache = nullptr;
-    }
-
+    typeNameCache = nullptr;
     scripts.clear();
 
     // An addref() was made when the QQmlCleanup was added to the engine.
diff --git a/src/qml/qml/qqmlscriptdata_p.h b/src/qml/qml/qqmlscriptdata_p.h
index 273ba3691f..80b65b699c 100644
--- a/src/qml/qml/qqmlscriptdata_p.h
+++ b/src/qml/qml/qqmlscriptdata_p.h
@@ -82,7 +82,7 @@ private:
 public:
     QUrl url;
     QString urlString;
-    QQmlTypeNameCache *typeNameCache;
+    QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
     QVector<QQmlRefPointer<QQmlScriptBlob>> scripts;
 
     QV4::ReturnedValue scriptValueForContext(QQmlContextData *parentCtxt);
diff --git a/src/qml/qml/qqmltypecompiler.cpp b/src/qml/qml/qqmltypecompiler.cpp
index 9a6bd73326..bbeaf7be9a 100644
--- a/src/qml/qml/qqmltypecompiler.cpp
+++ b/src/qml/qml/qqmltypecompiler.cpp
@@ -158,6 +158,9 @@ QQmlRefPointer<QV4::ExecutableCompilationUnit> QQmlTypeCompiler::compile()
     QmlIR::QmlUnitGenerator qmlGenerator;
     qmlGenerator.generate(*document, dependencyHasher);
 
+    if (!errors.isEmpty())
+        return nullptr;
+
     QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit
             = QV4::ExecutableCompilationUnit::create(std::move(
                     document->javaScriptCompilationUnit));
@@ -165,11 +168,7 @@ QQmlRefPointer<QV4::ExecutableCompilationUnit> QQmlTypeCompiler::compile()
     compilationUnit->resolvedTypes = *resolvedTypes;
     compilationUnit->propertyCaches = std::move(m_propertyCaches);
     Q_ASSERT(compilationUnit->propertyCaches.count() == static_cast<int>(compilationUnit->objectCount()));
-
-    if (errors.isEmpty())
-        return compilationUnit;
-    else
-        return nullptr;
+    return compilationUnit;
 }
 
 void QQmlTypeCompiler::recordError(const QV4::CompiledData::Location &location, const QString &description)
diff --git a/src/qml/qml/qqmltypedata.cpp b/src/qml/qml/qqmltypedata.cpp
index 8d75b57fc1..99fe069685 100644
--- a/src/qml/qml/qqmltypedata.cpp
+++ b/src/qml/qml/qqmltypedata.cpp
@@ -305,6 +305,7 @@ void QQmlTypeData::done()
         QQmlJS::DiagnosticMessage error = buildTypeResolutionCaches(&typeNameCache, &resolvedTypeCache);
         if (error.isValid()) {
             setError(error);
+            qDeleteAll(resolvedTypeCache);
             return;
         }
     }
@@ -614,6 +615,8 @@ void QQmlTypeData::compile(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCach
     QQmlTypeCompiler compiler(enginePrivate, this, m_document.data(), typeNameCache, resolvedTypeCache, dependencyHasher);
     m_compiledData = compiler.compile();
     if (!m_compiledData) {
+        qDeleteAll(*resolvedTypeCache);
+        resolvedTypeCache->clear();
         setError(compiler.compilationErrors());
         return;
     }
@@ -678,7 +681,7 @@ void QQmlTypeData::resolveTypes()
 
         if (ref.type.isCompositeSingleton()) {
             ref.typeData = typeLoader()->getType(ref.type.sourceUrl());
-            if (ref.typeData->status() == QQmlDataBlob::ResolvingDependencies) {
+            if (ref.typeData->status() == QQmlDataBlob::ResolvingDependencies || m_waitingOnMe.contains(ref.typeData.data())) {
                 // TODO: give an error message? If so, we should record and show the path of the cycle.
                 continue;
             }
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 355150b786..d634a48443 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -229,8 +229,10 @@ OwnPropertyKeyIterator *QtObject::virtualOwnPropertyKeys(const Object *m, Value
 }
 
 /*!
-\qmlmethod bool Qt::isQtObject(object)
-Returns true if \c object is a valid reference to a Qt or QML object, otherwise false.
+    \qmlmethod bool Qt::isQtObject(object)
+
+    Returns \c true if \a object is a valid reference to a Qt or QML object,
+    \c false otherwise.
 */
 ReturnedValue QtObject::method_isQtObject(const FunctionObject *, const Value *, const Value *argv, int argc)
 {
@@ -241,10 +243,10 @@ ReturnedValue QtObject::method_isQtObject(const FunctionObject *, const Value *,
 }
 
 /*!
-\qmlmethod color Qt::rgba(real red, real green, real blue, real alpha)
+    \qmlmethod color Qt::rgba(real red, real green, real blue, real alpha)
 
-Returns a color with the specified \c red, \c green, \c blue and \c alpha components.
-All components should be in the range 0-1 inclusive.
+    Returns a color with the specified \a red, \a green, \a blue, and \a alpha
+    components. All components should be in the range 0-1 (inclusive).
 */
 ReturnedValue QtObject::method_rgba(const FunctionObject *f, const Value *, const Value *argv, int argc)
 {
@@ -270,10 +272,10 @@ ReturnedValue QtObject::method_rgba(const FunctionObject *f, const Value *, cons
 }
 
 /*!
-\qmlmethod color Qt::hsla(real hue, real saturation, real lightness, real alpha)
+    \qmlmethod color Qt::hsla(real hue, real saturation, real lightness, real alpha)
 
-Returns a color with the specified \c hue, \c saturation, \c lightness and \c alpha components.
-All components should be in the range 0-1 inclusive.
+    Returns a color with the specified \a hue, \a saturation, \a lightness, and \a alpha
+    components. All components should be in the range 0-1 (inclusive).
 */
 ReturnedValue QtObject::method_hsla(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -300,12 +302,12 @@ ReturnedValue QtObject::method_hsla(const FunctionObject *b, const Value *, cons
 }
 
 /*!
-\qmlmethod color Qt::hsva(real hue, real saturation, real value, real alpha)
+    \since 5.5
+    \qmlmethod color Qt::hsva(real hue, real saturation, real value, real alpha)
 
-Returns a color with the specified \c hue, \c saturation, \c value and \c alpha components.
-All components should be in the range 0-1 inclusive.
+    Returns a color with the specified \a hue, \a saturation, \a value and \a alpha
+    components. All components should be in the range 0-1 (inclusive).
 
-\since 5.5
 */
 ReturnedValue QtObject::method_hsva(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -328,12 +330,12 @@ ReturnedValue QtObject::method_hsva(const FunctionObject *b, const Value *, cons
 }
 
 /*!
-\qmlmethod color Qt::colorEqual(color lhs, string rhs)
+    \qmlmethod color Qt::colorEqual(color lhs, string rhs)
 
-Returns true if both \c lhs and \c rhs yield equal color values.  Both arguments
-may be either color values or string values.  If a string value is supplied it
-must be convertible to a color, as described for the \l{colorbasictypedocs}{color}
-basic type.
+    Returns \c true if both \a lhs and \a rhs yield equal color values. Both
+    arguments may be either color values or string values. If a string value
+    is supplied it must be convertible to a color, as described for the
+    \l{colorbasictypedocs}{color} basic type.
 */
 ReturnedValue QtObject::method_colorEqual(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -368,11 +370,9 @@ ReturnedValue QtObject::method_colorEqual(const FunctionObject *b, const Value *
 }
 
 /*!
-\qmlmethod rect Qt::rect(int x, int y, int width, int height)
-
-Returns a \c rect with the top-left corner at \c x, \c y and the specified \c width and \c height.
+    \qmlmethod rect Qt::rect(int x, int y, int width, int height)
 
-The returned object has \c x, \c y, \c width and \c height attributes with the given values.
+    Returns a rect with the top-left corner at \a x, \a y and the specified \a width and \a height.
 */
 ReturnedValue QtObject::method_rect(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -389,8 +389,9 @@ ReturnedValue QtObject::method_rect(const FunctionObject *b, const Value *, cons
 }
 
 /*!
-\qmlmethod point Qt::point(int x, int y)
-Returns a Point with the specified \c x and \c y coordinates.
+    \qmlmethod point Qt::point(int x, int y)
+
+    Returns a point with the specified \a x and \a y coordinates.
 */
 ReturnedValue QtObject::method_point(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -405,8 +406,9 @@ ReturnedValue QtObject::method_point(const FunctionObject *b, const Value *, con
 }
 
 /*!
-\qmlmethod Qt::size(int width, int height)
-Returns a Size with the specified \c width and \c height.
+    \qmlmethod size Qt::size(int width, int height)
+
+    Returns a size with the specified \a width and \a height.
 */
 ReturnedValue QtObject::method_size(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -421,12 +423,13 @@ ReturnedValue QtObject::method_size(const FunctionObject *b, const Value *, cons
 }
 
 /*!
-\qmlmethod Qt::font(object fontSpecifier)
-Returns a Font with the properties specified in the \c fontSpecifier object
-or the nearest matching font.  The \c fontSpecifier object should contain
-key-value pairs where valid keys are the \l{fontbasictypedocs}{font} type's
-subproperty names, and the values are valid values for each subproperty.
-Invalid keys will be ignored.
+    \qmlmethod font Qt::font(object fontSpecifier)
+
+    Returns a font with the properties specified in the \a fontSpecifier object
+    or the nearest matching font.  The \a fontSpecifier object should contain
+    key-value pairs where valid keys are the \l{fontbasictypedocs}{font} type's
+    subproperty names, and the values are valid values for each subproperty.
+    Invalid keys will be ignored.
 */
 ReturnedValue QtObject::method_font(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -445,8 +448,9 @@ ReturnedValue QtObject::method_font(const FunctionObject *b, const Value *, cons
 
 
 /*!
-\qmlmethod Qt::vector2d(real x, real y)
-Returns a Vector2D with the specified \c x and \c y.
+    \qmlmethod vector2d Qt::vector2d(real x, real y)
+
+    Returns a vector2d with the specified \a x and \a y values.
 */
 ReturnedValue QtObject::method_vector2d(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -463,8 +467,9 @@ ReturnedValue QtObject::method_vector2d(const FunctionObject *b, const Value *,
 }
 
 /*!
-\qmlmethod Qt::vector3d(real x, real y, real z)
-Returns a Vector3D with the specified \c x, \c y and \c z.
+    \qmlmethod vector3d Qt::vector3d(real x, real y, real z)
+
+    Returns a vector3d with the specified \a x, \a y, and \a z values.
 */
 ReturnedValue QtObject::method_vector3d(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -482,8 +487,9 @@ ReturnedValue QtObject::method_vector3d(const FunctionObject *b, const Value *,
 }
 
 /*!
-\qmlmethod Qt::vector4d(real x, real y, real z, real w)
-Returns a Vector4D with the specified \c x, \c y, \c z and \c w.
+    \qmlmethod vector4d Qt::vector4d(real x, real y, real z, real w)
+
+    Returns a vector4d with the specified \a x, \a y, \a z, and \a w values.
 */
 ReturnedValue QtObject::method_vector4d(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -502,8 +508,9 @@ ReturnedValue QtObject::method_vector4d(const FunctionObject *b, const Value *,
 }
 
 /*!
-\qmlmethod Qt::quaternion(real scalar, real x, real y, real z)
-Returns a Quaternion with the specified \c scalar, \c x, \c y, and \c z.
+    \qmlmethod quaternion Qt::quaternion(real scalar, real x, real y, real z)
+
+    Returns a quaternion with the specified \a scalar, \a x, \a y, and \a z values.
 */
 ReturnedValue QtObject::method_quaternion(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -522,13 +529,25 @@ ReturnedValue QtObject::method_quaternion(const FunctionObject *b, const Value *
 }
 
 /*!
-\qmlmethod Qt::matrix4x4(real m11, real m12, real m13, real m14, real m21, real m22, real m23, real m24, real m31, real m32, real m33, real m34, real m41, real m42, real m43, real m44)
-Returns a Matrix4x4 with the specified values.
-Alternatively, the function may be called with a single argument
-where that argument is a JavaScript array which contains the sixteen
-matrix values.
-Finally, the function may be called with no arguments and the resulting
-matrix will be the identity matrix.
+    \qmlmethod matrix4x4 Qt::matrix4x4(real m11, real m12, real m13, real m14, real m21, real m22, real m23, real m24, real m31, real m32, real m33, real m34, real m41, real m42, real m43, real m44)
+
+    Returns a matrix4x4 with the specified values.
+
+    The arguments correspond to their positions in the matrix:
+
+    \table
+    \row \li \a m11 \li \a m12 \li \a m13 \li \a m14
+    \row \li \a m21 \li \a m22 \li \a m23 \li \a m24
+    \row \li \a m31 \li \a m32 \li \a m33 \li \a m34
+    \row \li \a m41 \li \a m42 \li \a m43 \li \a m44
+    \endtable
+
+    Alternatively, the function may be called with a single argument
+    where that argument is a JavaScript array which contains the sixteen
+    matrix values.
+
+    Finally, the function may be called with no arguments and the resulting
+    matrix will be the identity matrix.
 */
 ReturnedValue QtObject::method_matrix4x4(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -572,18 +591,19 @@ ReturnedValue QtObject::method_matrix4x4(const FunctionObject *b, const Value *,
 }
 
 /*!
-\qmlmethod color Qt::lighter(color baseColor, real factor)
-Returns a color lighter than \c baseColor by the \c factor provided.
+    \qmlmethod color Qt::lighter(color baseColor, real factor)
+
+    Returns a color lighter than \a baseColor by the \a factor provided.
 
-If the factor is greater than 1.0, this functions returns a lighter color.
-Setting factor to 1.5 returns a color that is 50% brighter. If the factor is less than 1.0,
-the return color is darker, but we recommend using the Qt.darker() function for this purpose.
-If the factor is 0 or negative, the return value is unspecified.
+    If the factor is greater than 1.0, this functions returns a lighter color.
+    Setting factor to 1.5 returns a color that is 50% brighter. If the factor is less than 1.0,
+    the return color is darker, but we recommend using the Qt.darker() function for this purpose.
+    If the factor is 0 or negative, the return value is unspecified.
 
-The function converts the current RGB color to HSV, multiplies the value (V) component
-by factor and converts the color back to RGB.
+    The function converts the current RGB color to HSV, multiplies the value (V) component
+    by factor and converts the color back to RGB.
 
-If \c factor is not supplied, returns a color 50% lighter than \c baseColor (factor 1.5).
+    If \a factor is not supplied, returns a color that is 50% lighter than \a baseColor (factor 1.5).
 */
 ReturnedValue QtObject::method_lighter(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -610,19 +630,20 @@ ReturnedValue QtObject::method_lighter(const FunctionObject *b, const Value *, c
 }
 
 /*!
-\qmlmethod color Qt::darker(color baseColor, real factor)
-Returns a color darker than \c baseColor by the \c factor provided.
+    \qmlmethod color Qt::darker(color baseColor, real factor)
 
-If the factor is greater than 1.0, this function returns a darker color.
-Setting factor to 3.0 returns a color that has one-third the brightness.
-If the factor is less than 1.0, the return color is lighter, but we recommend using
-the Qt.lighter() function for this purpose. If the factor is 0 or negative, the return
-value is unspecified.
+    Returns a color darker than \a baseColor by the \a factor provided.
 
-The function converts the current RGB color to HSV, divides the value (V) component
-by factor and converts the color back to RGB.
+    If the factor is greater than 1.0, this function returns a darker color.
+    Setting factor to 3.0 returns a color that has one-third the brightness.
+    If the factor is less than 1.0, the return color is lighter, but we recommend using
+    the Qt.lighter() function for this purpose. If the factor is 0 or negative, the return
+    value is unspecified.
 
-If \c factor is not supplied, returns a color 50% darker than \c baseColor (factor 2.0).
+    The function converts the current RGB color to HSV, divides the value (V) component
+    by factor and converts the color back to RGB.
+
+    If \a factor is not supplied, returns a color that is 50% darker than \a baseColor (factor 2.0).
 */
 ReturnedValue QtObject::method_darker(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -650,7 +671,8 @@ ReturnedValue QtObject::method_darker(const FunctionObject *b, const Value *, co
 
 /*!
     \qmlmethod color Qt::tint(color baseColor, color tintColor)
-    This function allows tinting one color with another.
+
+    This function allows tinting one color (\a baseColor) with another (\a tintColor).
 
     The tint color should usually be mostly transparent, or you will not be
     able to see the underlying color. The below example provides a slight red
@@ -670,7 +692,8 @@ ReturnedValue QtObject::method_darker(const FunctionObject *b, const Value *, co
     \endqml
     \image declarative-rect_tint.png
 
-    Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color.
+    Tint is most useful when a subtle change is intended to be conveyed due to some event;
+    you can then use tinting to more effectively tune the visible color.
 */
 ReturnedValue QtObject::method_tint(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -708,8 +731,8 @@ ReturnedValue QtObject::method_tint(const FunctionObject *b, const Value *, cons
 /*!
 \qmlmethod string Qt::formatDate(datetime date, variant format)
 
-Returns a string representation of \c date, optionally formatted according
-to \c format.
+Returns a string representation of \a date, optionally formatted according
+to \a format.
 
 The \a date parameter may be a JavaScript \c Date object, a \l{date}{date}
 property, a QDate, or QDateTime value. The \a format parameter may be any of
@@ -752,8 +775,8 @@ ReturnedValue QtObject::method_formatDate(const FunctionObject *b, const Value *
 /*!
 \qmlmethod string Qt::formatTime(datetime time, variant format)
 
-Returns a string representation of \c time, optionally formatted according to
-\c format.
+Returns a string representation of \a time, optionally formatted according to
+\a format.
 
 The \a time parameter may be a JavaScript \c Date object, a QTime, or QDateTime
 value. The \a format parameter may be any of the possible format values as
@@ -801,10 +824,10 @@ ReturnedValue QtObject::method_formatTime(const FunctionObject *b, const Value *
 /*!
 \qmlmethod string Qt::formatDateTime(datetime dateTime, variant format)
 
-Returns a string representation of \c datetime, optionally formatted according to
-\c format.
+Returns a string representation of \a dateTime, optionally formatted according to
+\a format.
 
-The \a date parameter may be a JavaScript \c Date object, a \l{date}{date}
+The \a dateTime parameter may be a JavaScript \c Date object, a \l{date}{date}
 property, a QDate, QTime, or QDateTime value.
 
 If \a format is not provided, \a dateTime is formatted using
@@ -921,8 +944,8 @@ ReturnedValue QtObject::method_formatDateTime(const FunctionObject *b, const Val
 /*!
     \qmlmethod bool Qt::openUrlExternally(url target)
 
-    Attempts to open the specified \c target url in an external application, based on the user's
-    desktop preferences. Returns true if it succeeds, and false otherwise.
+    Attempts to open the specified \a target url in an external application, based on the user's
+    desktop preferences. Returns \c true if it succeeds, \c false otherwise.
 
     \warning A return value of \c true indicates that the application has successfully requested
     the operating system to open the URL in an external application. The external application may
@@ -942,6 +965,7 @@ ReturnedValue QtObject::method_openUrlExternally(const FunctionObject *b, const
 
 /*!
   \qmlmethod url Qt::resolvedUrl(url url)
+
   Returns \a url resolved relative to the URL of the caller.
 */
 ReturnedValue QtObject::method_resolvedUrl(const FunctionObject *b, const Value *, const Value *argv, int argc)
@@ -967,6 +991,7 @@ ReturnedValue QtObject::method_resolvedUrl(const FunctionObject *b, const Value
 
 /*!
 \qmlmethod list<string> Qt::fontFamilies()
+
 Returns a list of the font families available to the application.
 */
 ReturnedValue QtObject::method_fontFamilies(const FunctionObject *b, const Value *, const Value *, int argc)
@@ -980,7 +1005,7 @@ ReturnedValue QtObject::method_fontFamilies(const FunctionObject *b, const Value
 
 /*!
 \qmlmethod string Qt::md5(data)
-Returns a hex string of the md5 hash of \c data.
+Returns a hex string of the md5 hash of \a data.
 */
 ReturnedValue QtObject::method_md5(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -995,7 +1020,7 @@ ReturnedValue QtObject::method_md5(const FunctionObject *b, const Value *, const
 
 /*!
 \qmlmethod string Qt::btoa(data)
-Binary to ASCII - this function returns a base64 encoding of \c data.
+Binary to ASCII - this function returns a base64 encoding of \a data.
 */
 ReturnedValue QtObject::method_btoa(const FunctionObject *b, const Value *, const Value *argv, int argc)
 {
@@ -1043,9 +1068,9 @@ ReturnedValue QtObject::method_quit(const FunctionObject *b, const Value *, cons
 
     This function causes the QQmlEngine::exit(int) signal to be emitted.
     Within the \l {Prototyping with qmlscene}, this causes the launcher application to exit
-    the specified return code. To exit from the event loop with a specified return code when this
-    method is called, a C++ application can connect the QQmlEngine::exit(int) signal
-    to the QCoreApplication::exit(int) slot.
+    the specified return code (\a retCode). To exit from the event loop with a specified
+    return code when this method is called, a C++ application can connect the
+    QQmlEngine::exit(int) signal to the QCoreApplication::exit(int) slot.
 
     \sa quit()
 */
@@ -1318,13 +1343,13 @@ ReturnedValue QtObject::method_createComponent(const FunctionObject *b, const Va
     \qmlmethod Qt::locale(name)
 
     Returns a JS object representing the locale with the specified
-    name, which has the format "language[_territory][.codeset][@modifier]"
+    \a name, which has the format "language[_territory][.codeset][@modifier]"
     or "C", where:
 
     \list
-    \li language is a lowercase, two-letter, ISO 639 language code,
-    \li territory is an uppercase, two-letter, ISO 3166 country code,
-    \li and codeset and modifier are ignored.
+    \li \c language is a lowercase, two-letter, ISO 639 language code,
+    \li \c territory is an uppercase, two-letter, ISO 3166 country code, and
+    \li \c codeset and \c modifier are ignored.
     \endlist
 
     If the string violates the locale format, or language is not a
@@ -1372,7 +1397,8 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction);
 /*!
     \qmlmethod Qt::binding(function)
 
-    Returns a JavaScript object representing a \l{Property Binding}{property binding}.
+    Returns a JavaScript object representing a \l{Property Binding}{property binding},
+    with a \a function that evaluates the binding.
 
     There are two main use-cases for the function: firstly, to apply a
     property binding imperatively from JavaScript code: