5 files changed, 29 insertions, 34 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index 8a606d672a..7fb4724f73 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -262,8 +262,8 @@ method.
 
 \section2 Sequence Type to JavaScript Array
 
-Certain C++ sequence types are supported transparently in QML as JavaScript
-\c Array types.
+Certain C++ sequence types are supported transparently in QML to behave like
+JavaScript \c Array types.
 
 In particular, QML currently supports:
 \list
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index aefdfd9401..52534b4a62 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -255,9 +255,6 @@ type, and so cannot provide the necessary QML property characteristics
 through the Qt meta object system, such as signal notifications when a list
 is modified.
 
-QQmlListProperty is a template class that can be conveniently constructed from
-a QList value.
-
 For example, the \c MessageBoard class below has a \c messages property of
 type QQmlListProperty that stores a list of \c Message instances:
 
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 55ca040af6..62c0f5d81b 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -538,30 +538,6 @@
    }
    \endqml
 
-   Since singleton types do not have an associated QQmlContext object, then within the functions of a QObject-derived
-   type that is registered as a singleton type implementation the QML context and engine information is not available.
-   The QQmlEngine::contextForObject() function returns NULL when supplied with a pointer to an QObject that
-   implements a singleton type.
-
-   Extending the above example:
-
-   \code
-   class SingletonTypeExample : public QObject
-   {
-       ...
-
-       Q_INVOKABLE void doSomethingElse()
-       {
-           // QML Engine/Context information is not accessible here:
-           Q_ASSERT(QQmlEngine::contextForObject(this) == 0);
-           Q_ASSERT(qmlContext(this) == 0);
-           Q_ASSERT(qmlEngine(this) == 0);
-       }
-
-       ...
-   }
-   \endcode
-
    \sa {Choosing the Correct Integration Method Between C++ and QML}
 */
 
@@ -662,3 +638,25 @@
   are registered for that version. This is particularly useful for keeping the
   versions of related modules in sync.
 */
+
+/*!
+  \since 5.12
+  \fn int qmlTypeId(const char* uri, int versionMajor, int versionMinor, const char *qmlName);
+  \relates QQmlEngine
+
+  Returns the QML type id of a type that was registered with the
+  name \a qmlName in a particular \a uri and a version specified in \a
+  versionMajor and \a versionMinor.
+
+  This function returns the same value as the QML type registration functions
+  such as qmlRegisterType() and qmlRegisterSingletonType().
+
+  If \a qmlName, \a uri and \a versionMajor match a registered type, but the
+  specified minor version in \a versionMinor is higher, then the id of the type
+  with the closest minor version is returned.
+
+  Returns -1 if no matching type was found or one of the given parameters
+  was invalid.
+
+  \sa qmlRegisterType(), qmlRegisterSingletonType()
+*/
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 960ea116c9..d38f592648 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtQml 2.11
+\qmlmodule QtQml 2.12
 \title Qt QML QML Types
 \ingroup qmlmodules
 \brief List of QML types provided by the Qt QML module
@@ -43,11 +43,11 @@ The types provided by the \c QtQml module are only available in a QML document
 if that document imports the \c QtQml namespace (or if the document imports the
 \c QtQuick namespace, as noted below).
 
-The current version of the \c QtQml module is version 2.11, and thus it may be
+The current version of the \c QtQml module is version 2.12, and thus it may be
 imported via the following statement:
 
 \qml
-import QtQml 2.11
+import QtQml 2.12
 \endqml
 
 Most clients will never need to use the \c QtQml import, as all of the types
@@ -55,7 +55,7 @@ are also provided by the \c QtQuick namespace which may be imported as
 follows:
 
 \qml
-import QtQuick 2.11
+import QtQuick 2.12
 \endqml
 
 See the \l{Qt Quick} module documentation for more information about the \c
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index b4bc9a0774..a964534fec 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -58,7 +58,7 @@ following directive:
 The QML types in Qt QML are available through the \c QtQML import. To use the
 types, add the following import statement to your .qml file:
 \code
-import QtQml 2.11
+import QtQml 2.12
 \endcode