Doc: Updated imports, \qmlmodule, and \inqmlmodule versions in src/qml.

-QDoc ignores the version in \inqmlmodule so its better to remove them
to avoid confusion.
-Qt QML import version is 2.2 for 5.2 release
-Qt Quick import version is 2.2 for 5.2 release

Task-number: QTBUG-32172
Change-Id: I15df270f1fb4df0476a9ddd854fb9ddf58e9fc7c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

11 files changed, 15 insertions, 15 deletions

diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc
index e18ddb3bd2..367e159431 100644
--- a/src/qml/doc/src/javascript/date.qdoc
+++ b/src/qml/doc/src/javascript/date.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \qmltype Date
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief Provides date functions
 
     The QML Date object extends the
diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc
index fa56f71925..e3210baca2 100644
--- a/src/qml/doc/src/javascript/number.qdoc
+++ b/src/qml/doc/src/javascript/number.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \qmltype Number
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief The Number object provides represents a number value
 
     The QML Number object extends the JS Number object with
diff --git a/src/qml/doc/src/javascript/string.qdoc b/src/qml/doc/src/javascript/string.qdoc
index ab7d7a4ebe..5c3c2b52f4 100644
--- a/src/qml/doc/src/javascript/string.qdoc
+++ b/src/qml/doc/src/javascript/string.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \qmltype String
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief The String object represents a string value
 
     The QML String object extends the JS String object with
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index 0b363d424e..e927e8ef78 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtQml 2
+\qmlmodule QtQml 2.2
 \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.0, and thus it may be
+The current version of the \c QtQml module is version 2.2, and thus it may be
 imported via the following statement:
 
 \qml
-import QtQml 2.0
+import QtQml 2.2
 \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.0
+import QtQuick 2.2
 \endqml
 
 See the \l{Qt Quick} module documentation for more information about the \c
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index f53df6386d..692d40b418 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -211,7 +211,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
     \qmltype Component
     \instantiates QQmlComponent
     \ingroup qml-utility-elements
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief Encapsulates a QML component definition
 
     Components are reusable, encapsulated QML types with well-defined interfaces.
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 2f873936e3..c8b602e48e 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -121,7 +121,7 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor)
 /*!
   \qmltype QtObject
     \instantiates QObject
-  \inqmlmodule QtQml 2
+  \inqmlmodule QtQml
   \ingroup qml-utility-elements
   \brief A basic QML type
 
@@ -275,7 +275,7 @@ QQmlImageProviderBase::~QQmlImageProviderBase()
 
 /*!
 \qmltype Qt
-\inqmlmodule QtQml 2
+\inqmlmodule QtQml
 \instantiates QQmlEnginePrivate
 \ingroup qml-utility-elements
 \keyword QmlGlobalQtObject
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index db949467d1..7610b6a9d9 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -732,7 +732,7 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data);
 /*!
     \qmltype Locale
     \instantiates QQmlLocale
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief Provides locale specific properties and formatted data
 
     The Locale object may only be created via the \l{QtQml2::Qt::locale()}{Qt.locale()} function.
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index 129a81ee50..e3a3d55e18 100644
--- a/src/qml/types/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
@@ -76,7 +76,7 @@ public:
 /*!
     \qmltype Binding
     \instantiates QQmlBind
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \ingroup qtquick-interceptors
     \brief Enables the arbitrary creation of property bindings
 
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index 725c169529..57c3a6f987 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -73,7 +73,7 @@ public:
 /*!
     \qmltype Connections
     \instantiates QQmlConnections
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \ingroup qtquick-interceptors
     \brief Describes generalized connections to signals
 
diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp
index 234494e088..4173813154 100644
--- a/src/qml/types/qqmlinstantiator.cpp
+++ b/src/qml/types/qqmlinstantiator.cpp
@@ -190,7 +190,7 @@ void QQmlInstantiatorPrivate::makeModel()
 /*!
     \qmltype Instantiator
     \instantiates QQmlInstantiator
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \brief Dynamically creates objects
 
     A Instantiator can be used to control the dynamic creation of objects, or to dynamically
diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp
index a1cb8532f7..71cce6051f 100644
--- a/src/qml/types/qqmltimer.cpp
+++ b/src/qml/types/qqmltimer.cpp
@@ -75,7 +75,7 @@ public:
 /*!
     \qmltype Timer
     \instantiates QQmlTimer
-    \inqmlmodule QtQml 2
+    \inqmlmodule QtQml
     \ingroup qtquick-interceptors
     \brief Triggers a handler at a specified interval