qdoc: no longer recognizes the version nr in QML refs

All QML references of the form
<QML-module-name><QML-module-version>::<QML-type>::<member-name> have
had the <QML-module-version> removed i.

Task-number: QTBUG-33776
Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

9 files changed, 33 insertions, 33 deletions

diff --git a/src/qml/doc/src/cppclasses/topic.qdoc b/src/qml/doc/src/cppclasses/topic.qdoc
index 7c21793cfd..4a72e684a0 100644
--- a/src/qml/doc/src/cppclasses/topic.qdoc
+++ b/src/qml/doc/src/cppclasses/topic.qdoc
@@ -88,7 +88,7 @@ properties of a QQmlContext, and how to access the context for an object.
 Dynamic object instantiation and dynamic expression evaluation are both core
 concepts in QML.  QML documents define object types which can be instantiated
 at run-time using a QQmlComponent.  An instance of the QQmlComponent class can
-be created in C++ directly, or via the \l{QtQml2::Qt::createComponent()}
+be created in C++ directly, or via the \l{QtQml::Qt::createComponent()}
 {Qt.createComponent()} function in imperative QML code.  Arbitrary expressions
 can be calculated in C++ via the QQmlExpression class, and such expressions
 can interact directly the QML context.
diff --git a/src/qml/doc/src/cppintegration/contextproperties.qdoc b/src/qml/doc/src/cppintegration/contextproperties.qdoc
index e0d5091f2f..abdc18981a 100644
--- a/src/qml/doc/src/cppintegration/contextproperties.qdoc
+++ b/src/qml/doc/src/cppintegration/contextproperties.qdoc
@@ -74,7 +74,7 @@ QML code invokes a method on the object instance:
 \endtable
 
 (Note that date/time values returned from C++ to QML can be formatted through
-\l{QtQml2::Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.)
+\l{QtQml::Qt::formatDateTime}{Qt.formatDateTime()} and associated functions.)
 
 If the QML item needs to receive signals from the context property, it can connect to them using the
 \l Connections type. For example, if \c ApplicationData has a signal named \c
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index 74a93436f5..8bad77ebab 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -124,7 +124,7 @@ QQuaternion and QMatrix4x4, are only available from QML when the \l {Qt Quick}
 module is included.
 
 As a convenience, many of these types can be specified in QML by string values,
-or by a related method provided by the \l {QtQml2::Qt} object. For example, the \l
+or by a related method provided by the \l {QtQml::Qt} object. For example, the \l
 {Image::sourceSize} property is of type \l size (which automatically translates
 to the QSize type) and can be specified by a string value formatted as
 "width\c{x}height", or by the Qt.size() function:
diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc
index 367e159431..208e2be3f7 100644
--- a/src/qml/doc/src/javascript/date.qdoc
+++ b/src/qml/doc/src/javascript/date.qdoc
@@ -132,7 +132,7 @@
     hour, if DST is currently in effect, while it was not for the time specified, or
     vice versa.
 
-    \sa {QtQml2::Locale}{Locale}
+    \sa {QtQml::Locale}{Locale}
 */
 
 /*!
@@ -142,7 +142,7 @@
     suitable for the specified \a locale
     in the specified \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
@@ -164,7 +164,7 @@
     Converts the Date to a string containing the date suitable for the specified \a locale
     in the specified \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
@@ -186,7 +186,7 @@
     Converts the Date to a string containing the time suitable for the specified \a locale
     in the specified \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
@@ -205,10 +205,10 @@
 /*!
     \qmlmethod string Date::fromLocaleString(locale, dateTimeString, format)
 
-    Converts the datetime string \a dateTimeString to a \l {QtQml2::Date}{Date}
+    Converts the datetime string \a dateTimeString to a \l {QtQml::Date}{Date}
     object using \a locale and \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
@@ -232,10 +232,10 @@
 /*!
     \qmlmethod string Date::fromLocaleDateString(locale, dateString, format)
 
-    Converts the date string \a dateString to a \l {QtQml2::Date}{Date} object
+    Converts the date string \a dateString to a \l {QtQml::Date}{Date} object
     using \a locale and \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
@@ -262,10 +262,10 @@
 /*!
     \qmlmethod string Date::fromLocaleTimeString(locale, timeString, format)
 
-    Converts the time string \a timeString to a \l {QtQml2::Date}{Date} object
+    Converts the time string \a timeString to a \l {QtQml::Date}{Date} object
     using \a locale and \a format.
 
-    If \a format is not specified, \l {QtQml2::Locale}{Locale.LongFormat} will
+    If \a format is not specified, \l {QtQml::Locale}{Locale.LongFormat} will
     be used.
 
     If \a locale is not specified, the default locale will be used.
diff --git a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
index e54404d2fd..1372858ca5 100644
--- a/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
+++ b/src/qml/doc/src/javascript/dynamicobjectcreation.qdoc
@@ -42,8 +42,8 @@ demonstration of the concepts discussed on this page.
 \section1 Creating Objects Dynamically
 
 There are two ways to create objects dynamically from JavaScript. You can
-either call \l {QtQml2::Qt::createComponent()}{Qt.createComponent()} to
-dynamically create a \l Component object, or use \l{QtQml2::Qt::createQmlObject()}
+either call \l {QtQml::Qt::createComponent()}{Qt.createComponent()} to
+dynamically create a \l Component object, or use \l{QtQml::Qt::createQmlObject()}
 {Qt.createQmlObject()} to create an object from a string of QML.  Creating a
 component is better if you have an existing component defined in a QML document
 and you want to dynamically create instances of that component.  Otherwise,
@@ -54,7 +54,7 @@ generated at runtime.
 \section2 Creating a Component Dynamically
 
 To dynamically load a component defined in a QML file, call the
-\l {QtQml2::Qt::createComponent()}{Qt.createComponent()} function in the
+\l {QtQml::Qt::createComponent()}{Qt.createComponent()} function in the
 \l {QmlGlobalQtObject}{Qt object}.
 This function takes the URL of the QML file as its only argument and creates
 a \l Component object from this URL.
@@ -113,7 +113,7 @@ created object is a visual (Qt Quick) object.  The created object will become a
 child of the \c appWindow object in \c main.qml, and appear in the scene.
 
 When using files with relative paths, the path should
-be relative to the file where \l {QtQml2::Qt::createComponent()}
+be relative to the file where \l {QtQml::Qt::createComponent()}
 {Qt.createComponent()} is executed.
 
 To connect signals to (or receive signals from) dynamically created objects,
@@ -127,7 +127,7 @@ It is also possible to instantiate components without blocking via the
 \section2 Creating an Object from a String of QML
 
 If the QML is not defined until runtime, you can create a QML object from
-a string of QML using the \l{QtQml2::Qt::createQmlObject()}{Qt.createQmlObject()}
+a string of QML using the \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}
 function, as in the following example:
 
 \snippet qml/createQmlObject.qml 0
@@ -153,9 +153,9 @@ first, the bindings in the dynamic object will no longer work.
 The actual creation context depends on how an object is created:
 
 \list
-\li If \l {QtQml2::Qt::createComponent()}{Qt.createComponent()} is used, the
+\li If \l {QtQml::Qt::createComponent()}{Qt.createComponent()} is used, the
     creation context is the QQmlContext in which this method is called
-\li If \l{QtQml2::Qt::createQmlObject()}{Qt.createQmlObject()} is called, the
+\li If \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()} is called, the
     creation context is the context of the parent object passed to this method
 \li If a \c {Component{}} object is defined and \l {Component::createObject()}
     {createObject()} or \l {Component::incubateObject()}{incubateObject()} is
@@ -221,7 +221,7 @@ Item {
 This would result in an error, since objects can only be dynamically
 destroyed if they were dynamically created.
 
-Objects created with \l{QtQml2::Qt::createQmlObject()}{Qt.createQmlObject()}
+Objects created with \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}
 can similarly be destroyed using \c destroy():
 
 \snippet qml/createQmlObject.qml 0
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc
index 809b74ed52..fa9aa9794c 100644
--- a/src/qml/doc/src/javascript/imports.qdoc
+++ b/src/qml/doc/src/javascript/imports.qdoc
@@ -125,14 +125,14 @@ When a JavaScript file is imported, it must be imported with a qualifier.  The
 functions in that file are then accessible from the importing script via the
 qualifier (that is, as \tt{Qualifier.functionName(params)}).  Sometimes it is
 desirable to have the functions made available in the importing context without
-needing to qualify them, and in this circumstance the \l{QtQml2::Qt::include()}
+needing to qualify them, and in this circumstance the \l{QtQml::Qt::include()}
 {Qt.include()} function may be used to include one JavaScript file from another.
 This copies all functions from the other file into the current file's
 namespace, but ignores all pragmas and imports defined in that file.
 
 For example, the QML code below left calls \c showCalculations() in \c script.js,
 which in turn can call \c factorial() in \c factorial.js, as it has included
-\c factorial.js using \l {QtQml2::Qt::include()}{Qt.include()}.
+\c factorial.js using \l {QtQml::Qt::include()}{Qt.include()}.
 
 \table
 \row
@@ -142,7 +142,7 @@ which in turn can call \c factorial() in \c factorial.js, as it has included
 \li \snippet qml/integrating-javascript/includejs/factorial.js 0
 \endtable
 
-Notice that calling \l {QtQml2::Qt::include()}{Qt.include()} copies all functions
+Notice that calling \l {QtQml::Qt::include()}{Qt.include()} copies all functions
 from \c factorial.js into the \c MyScript namespace, which means the QML
 component can also access \c factorial() directly as \c MyScript.factorial().
 
diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc
index e3210baca2..1dd7f4213c 100644
--- a/src/qml/doc/src/javascript/number.qdoc
+++ b/src/qml/doc/src/javascript/number.qdoc
@@ -33,7 +33,7 @@
     The QML Number object extends the JS Number object with
     locale aware functions.
 
-    \sa {QtQml2::Locale}{Locale}
+    \sa {QtQml::Locale}{Locale}
 */
 
 /*!
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index e927e8ef78..f592a18bb0 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -98,16 +98,16 @@ MyDatePicker { minDate: "2000-01-01"; maxDate: "2020-12-31" }
 \endqml
 
 To read a date value returned from a C++ extension class, use
-\l{QtQml2::Qt::formatDate()}{Qt.formatDate()} and \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
+\l{QtQml::Qt::formatDate()}{Qt.formatDate()} and \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 When integrating with C++, note that any QDate value
 \l{qtqml-cppintegration-data.html}{passed into QML from C++} is automatically
 converted into a \c date value, and vice-versa.
 
 This basic type is provided by the QML language. It can be implicitly converted
-to a \l{QtQml2::Date}{Date} object.
+to a \l{QtQml::Date}{Date} object.
 
-\sa {QtQml2::Date}{QML Date object}, {QML Basic Types}
+\sa {QtQml::Date}{QML Date object}, {QML Basic Types}
 */
 
 /*!
@@ -125,7 +125,7 @@ MyTimePicker { time: "14:22:15" }
 \endqml
 
 To read a time value returned from a C++ extension class, use
-\l{QtQml2::Qt::formatTime()}{Qt.formatTime()} and \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
+\l{QtQml::Qt::formatTime()}{Qt.formatTime()} and \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 Note that when converting historical times to and from javascript that QDateTime and the JS Date object
 have different methods of calculating historical daylight savings time application. This can lead to variations of one hour
@@ -154,7 +154,7 @@ To create a \c point value, specify it as a "x,y" string:
 CustomObject { myPointProperty: "0,20" }
 \endqml
 
-Or use the \l{QtQml2::Qt::point()}{Qt.point()} function:
+Or use the \l{QtQml::Qt::point()}{Qt.point()} function:
 
 \qml
 CustomObject { myPointProperty: Qt.point(0, 20) }
@@ -192,7 +192,7 @@ To create a \c size value, specify it as a "width x height" string:
 Image { sourceSize: "150x50" }
 \endqml
 
-Or use the \l{QtQml2::Qt::size()}{Qt.size()} function:
+Or use the \l{QtQml::Qt::size()}{Qt.size()} function:
 
 \qml
 Image { sourceSize: Qt.size(150, 50) }
@@ -232,7 +232,7 @@ To create a \c rect value, specify it as a "x, y, width x height" string:
 CustomObject { myRectProperty: "50,50,100x100" }
 \endqml
 
-Or use the \l{QtQml2::Qt::rect()}{Qt.rect()} function:
+Or use the \l{QtQml::Qt::rect()}{Qt.rect()} function:
 
 \qml
 CustomObject { myRectProperty: Qt.rect(50, 50, 100, 100) }
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc
index 9ad8c23a42..bf457d7ee6 100644
--- a/src/qml/doc/src/whatsnew.qdoc
+++ b/src/qml/doc/src/whatsnew.qdoc
@@ -123,7 +123,7 @@ has now been replaced by the new \l {Qt QML} and \l {Qt Quick} modules. See the
 
 \list
 \li QQmlExpression can now be constructed directly (and more efficiently) from a QQmlScriptString.
-\li The \l {QtQml2::Qt}{Qt} global object now provides an \l{QtQml2::Qt::inputMethod}{inputMethod} property to access the active
+\li The \l {QtQml::Qt}{Qt} global object now provides an \l{QtQml::Qt::inputMethod}{inputMethod} property to access the active
     text input method for an application.
 \endlist