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>

4 files changed, 22 insertions, 22 deletions

diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index 966bd9d804..be8b397a8e 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -163,7 +163,7 @@ and moves the new block to its position on the game canvas. This involves severa
 
 \list
 
-\li \l {QtQml2::Qt::createComponent()}{Qt.createComponent()} is called to
+\li \l {QtQml::Qt::createComponent()}{Qt.createComponent()} is called to
    generate a type from \c Block.qml.  If the component is ready,
    we can call \c createObject() to create an instance of the \c Block
    item.
diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
index bc67594960..1c48058510 100644
--- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
+++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc
@@ -138,7 +138,7 @@ The painting of these icons can be mirrored with a dedicated \c mirror property
 
 \section1 Default layout direction
 
-The \l {QtQml2::Qt::application}{Qt.application.layoutDirection} property can be used to query the active layout direction of the
+The \l {QtQml::Qt::application}{Qt.application.layoutDirection} property can be used to query the active layout direction of the
 application. It is based on QApplication::layoutDirection(), which most commonly determines the layout
 direction from the active language translation file.
 
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index c579d0f7ef..2f07b7b234 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -108,8 +108,8 @@ the view and cannot be moved by other means.
 \snippet tutorials/dynamicview/dynamicview2/dynamicview.qml 2
 
 Dragging the content item is enabled by binding it to the MouseArea's
-\l {QtQuick2::MouseArea::drag.target}{drag.target} property.  Because we still want the view to be
-flickable we wait until the MouseArea's \l {QtQuick2::MouseArea::onPressAndHold}{onPressAndHold}
+\l {QtQuick::MouseArea::drag.target}{drag.target} property.  Because we still want the view to be
+flickable we wait until the MouseArea's \l {QtQuick::MouseArea::onPressAndHold}{onPressAndHold}
 handler is triggered before binding the drag target. This way when mouse moves before the hold
 timeout has expired it is interpreted as moving the list and if it moves after it is interpreted as
 dragging an item.  To make it more obvious to the user when an item can be dragged we'll change the
@@ -153,7 +153,7 @@ it is attached to moves.
 
 Drag events are only sent while the active property is true, so in this example the first event
 would be sent when the delegate was held with additional event sents when dragging.  The
-\l {QtQuick2::Drag::hotSpot}{hotSpot} property specifies the relative position of the drag events
+\l {QtQuick::Drag::hotSpot}{hotSpot} property specifies the relative position of the drag events
 within the dragged item, the center of the item in this instance.
 
 Then we use a DropArea in each view item to determine when the hot spot of the dragged item
@@ -165,14 +165,14 @@ to the index of the item it was dragged over.
 To move the items within the view we use a VisualDataModel.  The VisualDataModel type is used by
 the view types to instantiate delegate items from model data and when constructed explicitly can
 be used to filter and re-order the model items provided to ListView.  The
-\l {QtQuick2::VisualDataModel::items}{items} property of VisualDataModel provides access to the
+\l {QtQuick::VisualDataModel::items}{items} property of VisualDataModel provides access to the
 view's items and allows us to change the visible order without modifying the source model.  To
-determine the current visible index of the items we use \l {QtQuick2::VisualDataModel::itemsIndex}
+determine the current visible index of the items we use \l {QtQuick::VisualDataModel::itemsIndex}
 {itemsIndex} property on the VisualDataModel attached property of the delegate item.
 
-To utilize a VisualDataModel with a ListView we bind it to the \l {QtQuick2::ListView::model}{model}
-property of the view and bind the \l {QtQuick2::VisualDataModel::model}{model} and
-\l {QtQuick2::VisualDataModel::delegate}{delegate} to the VisualDataModel.
+To utilize a VisualDataModel with a ListView we bind it to the \l {QtQuick::ListView::model}{model}
+property of the view and bind the \l {QtQuick::VisualDataModel::model}{model} and
+\l {QtQuick::VisualDataModel::delegate}{delegate} to the VisualDataModel.
 
 \snippet tutorials/dynamicview/dynamicview3/dynamicview.qml 4
 
@@ -194,7 +194,7 @@ like this:
 \section2 Walkthrough
 
 Items in a VisualDataModel are filtered into groups represented by the VisualDataGroup type,
-normally all items in the model belong to a default \l {QtQuick2::VisualDataModel::items}{items}
+normally all items in the model belong to a default \l {QtQuick::VisualDataModel::items}{items}
 group but this default can be changed with the includeByDefault property.  To implement our sorting
 we want items to first be added to an unsorted group from where we can transfer them to a sorted
 position in the items group.  To do that we clear includeByDefault on the items group and set it on
@@ -208,7 +208,7 @@ item and then transfer the item to the items group before moving it to the pre-d
 repeat until the unsorted group is empty.
 
 To find the insert position for an item we request a handle for the item from the unsorted group
-with the \l {QtQuick2::VisualDataModel::get} {get} function.  Through the model property on this
+with the \l {QtQuick::VisualDataModel::get} {get} function.  Through the model property on this
 handle we can access the same model data that is available in a delegate instance of that item and
 compare against other items to determine relative position.
 
@@ -220,7 +220,7 @@ of the list.  In this example it can be one of the following:
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 4
 
 A sort is triggered whenever new items are added to the unsorted VisualDataGroup which we are
-notified of by the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged} handler.  If no sort
+notified of by the \l {QtQuick::VisualDataGroup::onChanged}{onChanged} handler.  If no sort
 function is currently selected we simply transfer all items from the unsorted group to the items
 group, otherwise we call sort with the selected sort function.
 
@@ -228,8 +228,8 @@ group, otherwise we call sort with the selected sort function.
 
 Finally when the selected sort order changes we can trigger a full re-sort of the list by moving
 all items from the items group to the unsorted group, which will trigger the
-\l {QtQuick2::VisualDataGroup::onChanged}{onChanged} handler and transfer the items back to the
-items group in correct order.  Note that the \l {QtQuick2::VisualDataGroup::onChanged}{onChanged}
+\l {QtQuick::VisualDataGroup::onChanged}{onChanged} handler and transfer the items back to the
+items group in correct order.  Note that the \l {QtQuick::VisualDataGroup::onChanged}{onChanged}
 handler will not be invoked recursively so there's no issue with it being invoked during a sort.
 
 \snippet tutorials/dynamicview/dynamicview4/dynamicview.qml 6
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index d247b33e31..e3b2f4640d 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -84,9 +84,9 @@ In addition, the \c QtQuick module provides the following basic types:
 \section1 Object Types
 
 All of the object types provided by \c QtQuick are based on the \l{Item} type,
-which itself derives from \l{QtQml2::QtObject}{QtObject}.  \l{qtqml-typereference-topic.html#object-types}
+which itself derives from \l{QtQml::QtObject}{QtObject}.  \l{qtqml-typereference-topic.html#object-types}
 {QML object types} provided by the Qt QML module
-(such as \l{QtQml2::QtObject}{QtObject} and \l{QtQml2::Component}{Component}) are also available when
+(such as \l{QtQml::QtObject}{QtObject} and \l{QtQml::Component}{Component}) are also available when
 you import \c QtQuick.
 
 \section2 Visual Types
@@ -330,9 +330,9 @@ For more details about the module itself, see the \l{Qt Quick} module page.
     \li By a hexadecimal triplet or quad in the form \c "#RRGGBB" and \c "#AARRGGBB"
         respectively. For example, the color red corresponds to a triplet of \c "#FF0000"
         and a slightly transparent blue to a quad of \c "#800000FF".
-    \li Using the \l{QtQml2::Qt::rgba()}{Qt.rgba()}, \l{QtQml2::Qt::hsla()}{Qt.hsla()},
-        \l{QtQml2::Qt::darker()}{Qt.darker()}, \l{QtQml2::Qt::lighter()}{Qt.lighter()} or
-        \l{QtQml2::Qt::tint()}{Qt.tint()} functions.
+    \li Using the \l{QtQml::Qt::rgba()}{Qt.rgba()}, \l{QtQml::Qt::hsla()}{Qt.hsla()},
+        \l{QtQml::Qt::darker()}{Qt.darker()}, \l{QtQml::Qt::lighter()}{Qt.lighter()} or
+        \l{QtQml::Qt::tint()}{Qt.tint()} functions.
     \endlist
 
     Example:
@@ -354,7 +354,7 @@ For more details about the module itself, see the \l{Qt Quick} module page.
     }
     \endqml
 
-    To test color values for equality, use the \l{QtQml2::Qt::colorEqual()}{Qt.colorEqual()}
+    To test color values for equality, use the \l{QtQml::Qt::colorEqual()}{Qt.colorEqual()}
     function.  This allows colors to be accurately compared whether they are in property
     form or in any of the acceptable string specification forms.
 
@@ -595,7 +595,7 @@ console.log(c + " " + d); // false true
     Rotation { angle: 60; axis: "0,1,0" }
     \endqml
 
-    or with the \l{QtQml2::Qt::vector3d()}{Qt.vector3d()} function:
+    or with the \l{QtQml::Qt::vector3d()}{Qt.vector3d()} function:
 
     \qml
     Rotation { angle: 60; axis: Qt.vector3d(0, 1, 0) }