Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ibeba10bc821a01125a485df48a0bc88c45c01a73

4 files changed, 11 insertions, 11 deletions

diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc
index 0de0aa93ad..59f9c0db83 100644
--- a/src/quick/doc/src/concepts/effects/particles.qdoc
+++ b/src/quick/doc/src/concepts/effects/particles.qdoc
@@ -26,14 +26,14 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtQuick.Particles 2
+    \qmlmodule QtQuick.Particles 2.11
     \title Qt Quick Particles QML Types
     \ingroup qmlmodules
     \brief Provides QML types for particle effects
 
   This QML module contains a particle system for Qt Quick. To use these types, import the module with the following line:
   \code
-  import QtQuick.Particles 2.0
+  import QtQuick.Particles 2.11
   \endcode
 
   For a simple overview of how the system can be used, see \l{Using the Qt Quick Particle System}.
@@ -50,7 +50,7 @@
 
   Note that to use types from the particles module, you will need to import the types with the following line:
   \code
-  import QtQuick.Particles 2.0
+  import QtQuick.Particles 2.11
   \endcode
 
     \section1 The ParticleSystem
diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
index 06ebe2d3d1..a5f93b972a 100644
--- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
+++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc
@@ -38,7 +38,7 @@
     The QML types can be imported into your application using the following import statement in your \c {.qml} file.
 
     \code
-     import QtQuick.Layouts 1.2
+     import QtQuick.Layouts 1.11
     \endcode
 
     \section1 Key Features
diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc
index 8f390c83db..d82e35fb93 100644
--- a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc
+++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \qmlmodule QtQuick.Layouts 1.3
+    \qmlmodule QtQuick.Layouts 1.11
     \title Qt Quick Layouts QML Types
     \ingroup qmlmodules
     \brief Provides QML types for arranging QML items in a user interface.
@@ -40,7 +40,7 @@
     following import statement in your .qml file.
 
     \code
-    import QtQuick.Layouts 1.3
+    import QtQuick.Layouts 1.11
     \endcode
 
 */
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index f5b189c580..80b9241f36 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtQuick 2.7
+\qmlmodule QtQuick 2.11
 \title Qt Quick QML Types
 \ingroup qmlmodules
 \brief Provides graphical QML types.
@@ -34,11 +34,11 @@
 The \l{Qt Quick} module provides graphical primitive types. These types are only
 available in a QML document if that document imports the \c QtQuick namespace.
 
-The current version of the \c QtQuick module is version 2.7, and thus it may be
+The current version of the \c QtQuick module is version 2.11, and thus it may be
 imported via the following statement:
 
 \qml
-import QtQuick 2.7
+import QtQuick 2.11
 \endqml
 
 Visit the \l {Qt Quick} module documentation for more
@@ -883,14 +883,14 @@ console.log(c + " " + d); // false true
 */
 
 /*!
-\qmlmodule QtTest 1.1
+\qmlmodule QtTest 1.11
 \title Qt Quick Test QML Types
 \brief This module provides QML types to unit test your QML application
 \ingroup qmlmodules
 
 You can import this module using the following statement:
 \code
-import QtTest 1.1
+import QtTest 1.11
 \endcode
 
 For more information about how to use these types, see