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>

19 files changed, 136 insertions, 136 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
 
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index b83d901da5..2d3e9006b2 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -248,7 +248,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject)
     to specify how each list item is to be displayed.
 
     \c Component objects can also be created dynamically using
-    \l{QtQml2::Qt::createComponent()}{Qt.createComponent()}.
+    \l{QtQml::Qt::createComponent()}{Qt.createComponent()}.
 
     \section2 Creation Context
 
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 9c09960e93..aca18d8ef4 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -735,10 +735,10 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data);
     \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.
+    The Locale object may only be created via the \l{QtQml::Qt::locale()}{Qt.locale()} function.
     It cannot be created directly.
 
-    The \l{QtQml2::Qt::locale()}{Qt.locale()} function returns a JS Locale object representing the
+    The \l{QtQml::Qt::locale()}{Qt.locale()} function returns a JS Locale object representing the
     locale with the specified name, which has the format
     "language[_territory][.codeset][@modifier]" or "C".
 
@@ -864,7 +864,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 }
 
 /*!
-    \qmlproperty string QtQml2::Locale::name
+    \qmlproperty string QtQml::Locale::name
 
     Holds the language and country of this locale as a
     string of the form "language_country", where
@@ -873,50 +873,50 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::decimalPoint
+    \qmlproperty string QtQml::Locale::decimalPoint
 
     Holds the decimal point character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::groupSeparator
+    \qmlproperty string QtQml::Locale::groupSeparator
 
     Holds the group separator character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::percent
+    \qmlproperty string QtQml::Locale::percent
 
     Holds the percent character of this locale.
 */
 
 
 /*!
-    \qmlproperty string QtQml2::Locale::zeroDigit
+    \qmlproperty string QtQml::Locale::zeroDigit
 
     Holds Returns the zero digit character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::negativeSign
+    \qmlproperty string QtQml::Locale::negativeSign
 
     Holds the negative sign character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::positiveSign
+    \qmlproperty string QtQml::Locale::positiveSign
 
     Holds the positive sign character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::exponential
+    \qmlproperty string QtQml::Locale::exponential
 
     Holds the exponential character of this locale.
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::dateTimeFormat(type)
+    \qmlmethod string QtQml::Locale::dateTimeFormat(type)
 
     Returns the date time format used for the current locale.
     \a type specifies the FormatType to return.
@@ -925,7 +925,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::dateFormat(type)
+    \qmlmethod string QtQml::Locale::dateFormat(type)
 
     Returns the date format used for the current locale.
     \a type specifies the FormatType to return.
@@ -934,7 +934,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::timeFormat(type)
+    \qmlmethod string QtQml::Locale::timeFormat(type)
 
     Returns the time format used for the current locale.
     \a type specifies the FormatType to return.
@@ -943,7 +943,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::monthName(month, type)
+    \qmlmethod string QtQml::Locale::monthName(month, type)
 
     Returns the localized name of \a month (0-11), in the optional
     \l FormatType specified by \a type.
@@ -955,7 +955,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::standaloneMonthName(month, type)
+    \qmlmethod string QtQml::Locale::standaloneMonthName(month, type)
 
     Returns the localized name of \a month (0-11) that is used as a
     standalone text, in the optional \l FormatType specified by \a type.
@@ -970,7 +970,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::dayName(day, type)
+    \qmlmethod string QtQml::Locale::dayName(day, type)
 
     Returns the localized name of the \a day (where 0 represents
     Sunday, 1 represents Monday and so on), in the optional
@@ -980,7 +980,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::standaloneDayName(day, type)
+    \qmlmethod string QtQml::Locale::standaloneDayName(day, type)
 
     Returns the localized name of the \a day (where 0 represents
     Sunday, 1 represents Monday and so on) that is used as a
@@ -993,7 +993,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQml2::Locale::firstDayOfWeek
+    \qmlproperty enumeration QtQml::Locale::firstDayOfWeek
 
     Holds the first day of the week according to the current locale.
 
@@ -1012,7 +1012,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty Array<int> QtQml2::Locale::weekDays
+    \qmlproperty Array<int> QtQml::Locale::weekDays
 
     Holds an array of days that are considered week days according to the current locale,
     where Sunday is 0 and Saturday is 6.
@@ -1021,7 +1021,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty Array<string> QtQml2::Locale::uiLanguages
+    \qmlproperty Array<string> QtQml::Locale::uiLanguages
 
     Returns an ordered list of locale names for translation purposes in
     preference order.
@@ -1033,7 +1033,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQml2::Locale::textDirection
+    \qmlproperty enumeration QtQml::Locale::textDirection
 
     Holds the text direction of the language:
     \list
@@ -1043,19 +1043,19 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::amText
+    \qmlproperty string QtQml::Locale::amText
 
     The localized name of the "AM" suffix for times specified using the conventions of the 12-hour clock.
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::pmText
+    \qmlproperty string QtQml::Locale::pmText
 
     The localized name of the "PM" suffix for times specified using the conventions of the 12-hour clock.
 */
 
 /*!
-    \qmlmethod string QtQml2::Locale::currencySymbol(format)
+    \qmlmethod string QtQml::Locale::currencySymbol(format)
 
     Returns the currency symbol for the specified \a format:
     \list
@@ -1067,7 +1067,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::nativeLanguageName
+    \qmlproperty string QtQml::Locale::nativeLanguageName
 
     Holds a native name of the language for the locale. For example
     "Schwiizertüütsch" for Swiss-German locale.
@@ -1076,7 +1076,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQml2::Locale::nativeCountryName
+    \qmlproperty string QtQml::Locale::nativeCountryName
 
     Holds a native name of the country for the locale. For example
     "España" for Spanish/Spain locale.
@@ -1085,7 +1085,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQml2::Locale::measurementSystem
+    \qmlproperty enumeration QtQml::Locale::measurementSystem
 
     This property defines which units are used for measurement.
 
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index e92eb40037..a53a1ef1ec 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -602,7 +602,7 @@ to \c format.
 The \a date parameter may be a JavaScript \c Date object, a \l{date}{date}
 property, a QDate, or QDateTime value. The \a format parameter may be any of
 the possible format values as described for
-\l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
+\l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 If \a format is not specified, \a date is formatted using
 \l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
@@ -645,7 +645,7 @@ Returns a string representation of \c time, optionally formatted according to
 
 The \a time parameter may be a JavaScript \c Date object, a QTime, or QDateTime
 value. The \a format parameter may be any of the possible format values as
-described for \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
+described for \l{QtQml::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 If \a format is not specified, \a time is formatted using
 \l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
@@ -763,7 +763,7 @@ For example, if the following date/time value was specified:
     \endcode
 
 This \a dateTime value could be passed to \c Qt.formatDateTime(),
-\l {QtQml2::Qt::formatDate()}{Qt.formatDate()} or \l {QtQml2::Qt::formatTime()}{Qt.formatTime()}
+\l {QtQml::Qt::formatDate()}{Qt.formatDate()} or \l {QtQml::Qt::formatTime()}{Qt.formatTime()}
 with the \a format values below to produce the following results:
 
     \table
@@ -932,7 +932,7 @@ For example, if the above snippet had misspelled color as 'colro' then the array
 
 Note that this function returns immediately, and therefore may not work if
 the \a qml string loads new components (that is, external QML files that have not yet been loaded).
-If this is the case, consider using \l{QtQml2::Qt::createComponent()}{Qt.createComponent()} instead.
+If this is the case, consider using \l{QtQml::Qt::createComponent()}{Qt.createComponent()} instead.
 
 See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function.
 */
@@ -1068,7 +1068,7 @@ For example:
 See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function.
 
 To create a QML object from an arbitrary string of QML (instead of a file),
-use \l{QtQml2::Qt::createQmlObject()}{Qt.createQmlObject()}.
+use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}.
 */
 ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx)
 {
@@ -1152,7 +1152,7 @@ ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx)
     is not present, or is not a valid ISO 3166 code, the most
     appropriate country is chosen for the specified language.
 
-    \sa QtQuick2::Locale
+    \sa QtQuick::Locale
 */
 ReturnedValue QtObject::method_locale(SimpleCallContext *ctx)
 {
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index e3a3d55e18..f6da64f913 100644
--- a/src/qml/types/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
@@ -150,7 +150,7 @@ QQmlBind::~QQmlBind()
 }
 
 /*!
-    \qmlproperty bool QtQml2::Binding::when
+    \qmlproperty bool QtQml::Binding::when
 
     This property holds when the binding is active.
     This should be set to an expression that evaluates to true when you want the binding to be active.
@@ -182,7 +182,7 @@ void QQmlBind::setWhen(bool v)
 }
 
 /*!
-    \qmlproperty Object QtQml2::Binding::target
+    \qmlproperty Object QtQml::Binding::target
 
     The object to be updated.
 */
@@ -209,7 +209,7 @@ void QQmlBind::setObject(QObject *obj)
 }
 
 /*!
-    \qmlproperty string QtQml2::Binding::property
+    \qmlproperty string QtQml::Binding::property
 
     The property to be updated.
 */
@@ -236,7 +236,7 @@ void QQmlBind::setProperty(const QString &p)
 }
 
 /*!
-    \qmlproperty any QtQml2::Binding::value
+    \qmlproperty any QtQml::Binding::value
 
     The value to be set on the target object and property.  This can be a
     constant (which isn't very useful), or a bound expression.
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index 57c3a6f987..5e6a1a084a 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -138,7 +138,7 @@ QQmlConnections::~QQmlConnections()
 }
 
 /*!
-    \qmlproperty Object QtQml2::Connections::target
+    \qmlproperty Object QtQml::Connections::target
     This property holds the object that sends the signal.
 
     If this property is not set, the \c target defaults to the parent of the Connection.
@@ -183,7 +183,7 @@ void QQmlConnections::setTarget(QObject *obj)
 }
 
 /*!
-    \qmlproperty bool QtQml2::Connections::ignoreUnknownSignals
+    \qmlproperty bool QtQml::Connections::ignoreUnknownSignals
 
     Normally, a connection to a non-existent signal produces runtime errors.
 
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index 32d6505eff..f929880f58 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -150,7 +150,7 @@ QQmlDelegateModelParts::QQmlDelegateModelParts(QQmlDelegateModel *parent)
     The same implementation is now primarily available as DelegateModel in the
     \l{Qt QML Models QML Types}{Qt QML Models} module.
 
-    \sa {QtQml.Models2::DelegateModel}
+    \sa {QtQml.Models::DelegateModel}
 */
 /*!
     \qmltype DelegateModel
@@ -319,7 +319,7 @@ void QQmlDelegateModel::componentComplete()
 }
 
 /*!
-    \qmlproperty model QtQml.Models2::DelegateModel::model
+    \qmlproperty model QtQml.Models::DelegateModel::model
     This property holds the model providing data for the DelegateModel.
 
     The model provides a set of data that is used to create the items
@@ -360,7 +360,7 @@ void QQmlDelegateModel::setModel(const QVariant &model)
 }
 
 /*!
-    \qmlproperty Component QtQml.Models2::DelegateModel::delegate
+    \qmlproperty Component QtQml.Models::DelegateModel::delegate
 
     The delegate provides a template defining each item instantiated by a view.
     The index is exposed as an accessible \c index property.  Properties of the
@@ -398,7 +398,7 @@ void QQmlDelegateModel::setDelegate(QQmlComponent *delegate)
 }
 
 /*!
-    \qmlproperty QModelIndex QtQml.Models2::DelegateModel::rootIndex
+    \qmlproperty QModelIndex QtQml.Models::DelegateModel::rootIndex
 
     QAbstractItemModel provides a hierarchical tree of data, whereas
     QML only operates on list data.  \c rootIndex allows the children of
@@ -458,7 +458,7 @@ void QQmlDelegateModel::setRootIndex(const QVariant &root)
 }
 
 /*!
-    \qmlmethod QModelIndex QtQml.Models2::DelegateModel::modelIndex(int index)
+    \qmlmethod QModelIndex QtQml.Models::DelegateModel::modelIndex(int index)
 
     QAbstractItemModel provides a hierarchical tree of data, whereas
     QML only operates on list data.  This function assists in using
@@ -476,7 +476,7 @@ QVariant QQmlDelegateModel::modelIndex(int idx) const
 }
 
 /*!
-    \qmlmethod QModelIndex QtQml.Models2::DelegateModel::parentModelIndex()
+    \qmlmethod QModelIndex QtQml.Models::DelegateModel::parentModelIndex()
 
     QAbstractItemModel provides a hierarchical tree of data, whereas
     QML only operates on list data.  This function assists in using
@@ -494,7 +494,7 @@ QVariant QQmlDelegateModel::parentModelIndex() const
 }
 
 /*!
-    \qmlproperty int QtQml.Models2::DelegateModel::count
+    \qmlproperty int QtQml.Models::DelegateModel::count
 */
 
 int QQmlDelegateModel::count() const
@@ -606,7 +606,7 @@ QQmlDelegateModelGroup *QQmlDelegateModelPrivate::group_at(
 }
 
 /*!
-    \qmlproperty list<DelegateModelGroup> QtQml.Models2::DelegateModel::groups
+    \qmlproperty list<DelegateModelGroup> QtQml.Models::DelegateModel::groups
 
     This property holds a delegate model's group definitions.
 
@@ -636,7 +636,7 @@ QQmlListProperty<QQmlDelegateModelGroup> QQmlDelegateModel::groups()
 }
 
 /*!
-    \qmlproperty DelegateModelGroup QtQml.Models2::DelegateModel::items
+    \qmlproperty DelegateModelGroup QtQml.Models::DelegateModel::items
 
     This property holds visual data model's default group to which all new items are added.
 */
@@ -648,7 +648,7 @@ QQmlDelegateModelGroup *QQmlDelegateModel::items()
 }
 
 /*!
-    \qmlproperty DelegateModelGroup QtQml.Models2::DelegateModel::persistedItems
+    \qmlproperty DelegateModelGroup QtQml.Models::DelegateModel::persistedItems
 
     This property holds visual data model's persisted items group.
 
@@ -660,7 +660,7 @@ QQmlDelegateModelGroup *QQmlDelegateModel::items()
     at that time it will be destroyed.  Adding an item to this group will not create a new
     instance.
 
-    Items returned by the \l QtQml.Models2::DelegateModelGroup::create() function are automatically added
+    Items returned by the \l QtQml.Models::DelegateModelGroup::create() function are automatically added
     to this group.
 */
 
@@ -671,7 +671,7 @@ QQmlDelegateModelGroup *QQmlDelegateModel::persistedItems()
 }
 
 /*!
-    \qmlproperty string QtQml.Models2::DelegateModel::filterOnGroup
+    \qmlproperty string QtQml.Models::DelegateModel::filterOnGroup
 
     This property holds the name of the group used to filter the visual data model.
 
@@ -743,7 +743,7 @@ void QQmlDelegateModelPrivate::updateFilterGroup()
 }
 
 /*!
-    \qmlproperty object QtQml.Models2::DelegateModel::parts
+    \qmlproperty object QtQml.Models::DelegateModel::parts
 
     The \a parts property selects a DelegateModel which creates
     delegates from the part named.  This is used in conjunction with
@@ -2022,7 +2022,7 @@ QQmlDelegateModelAttached::QQmlDelegateModelAttached(
 }
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::DelegateModel::model
+    \qmlattachedproperty int QtQml.Models::DelegateModel::model
 
     This attached property holds the visual data model this delegate instance belongs to.
 
@@ -2035,7 +2035,7 @@ QQmlDelegateModel *QQmlDelegateModelAttached::model() const
 }
 
 /*!
-    \qmlattachedproperty stringlist QtQml.Models2::DelegateModel::groups
+    \qmlattachedproperty stringlist QtQml.Models::DelegateModel::groups
 
     This attached property holds the name of DelegateModelGroups the item belongs to.
 
@@ -2069,7 +2069,7 @@ void QQmlDelegateModelAttached::setGroups(const QStringList &groups)
 }
 
 /*!
-    \qmlattachedproperty bool QtQml.Models2::DelegateModel::isUnresolved
+    \qmlattachedproperty bool QtQml.Models::DelegateModel::isUnresolved
 
     This attached property holds whether the visual item is bound to a data model index.
     Returns true if the item is not bound to the model, and false if it is.
@@ -2089,7 +2089,7 @@ bool QQmlDelegateModelAttached::isUnresolved() const
 }
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::DelegateModel::inItems
+    \qmlattachedproperty int QtQml.Models::DelegateModel::inItems
 
     This attached property holds whether the item belongs to the default \l items DelegateModelGroup.
 
@@ -2099,7 +2099,7 @@ bool QQmlDelegateModelAttached::isUnresolved() const
 */
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::DelegateModel::itemsIndex
+    \qmlattachedproperty int QtQml.Models::DelegateModel::itemsIndex
 
     This attached property holds the index of the item in the default \l items DelegateModelGroup.
 
@@ -2107,7 +2107,7 @@ bool QQmlDelegateModelAttached::isUnresolved() const
 */
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::DelegateModel::inPersistedItems
+    \qmlattachedproperty int QtQml.Models::DelegateModel::inPersistedItems
 
     This attached property holds whether the item belongs to the \l persistedItems DelegateModelGroup.
 
@@ -2119,7 +2119,7 @@ bool QQmlDelegateModelAttached::isUnresolved() const
 */
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::DelegateModel::persistedItemsIndex
+    \qmlattachedproperty int QtQml.Models::DelegateModel::persistedItemsIndex
 
     This attached property holds the index of the item in the \l persistedItems DelegateModelGroup.
 
@@ -2221,7 +2221,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package)
     The same implementation is now primarily available as \l DelegateModelGroup
     in the \l{Qt QML Models QML Types}{Qt QML Models} module.
 
-    \sa {QtQml.Models2::DelegateModelGroup}
+    \sa {QtQml.Models::DelegateModelGroup}
 */
 /*!
     \qmltype DelegateModelGroup
@@ -2235,7 +2235,7 @@ void QQmlDelegateModelGroupPrivate::destroyingPackage(QQuickPackage *package)
     items.
 
     The initial set of instantiable delegate items in a DelegateModel is represented
-    by its \l {QtQml.Models2::DelegateModel::items}{items} group, which normally directly reflects
+    by its \l {QtQml.Models::DelegateModel::items}{items} group, which normally directly reflects
     the contents of the model assigned to DelegateModel::model.  This set can be changed to
     the contents of any other member of DelegateModel::groups by assigning the  \l name of that
     DelegateModelGroup to the DelegateModel::filterOnGroup property.
@@ -2280,7 +2280,7 @@ QQmlDelegateModelGroup::~QQmlDelegateModelGroup()
 }
 
 /*!
-    \qmlproperty string QtQml.Models2::DelegateModelGroup::name
+    \qmlproperty string QtQml.Models::DelegateModelGroup::name
 
     This property holds the name of the group.
 
@@ -2305,7 +2305,7 @@ void QQmlDelegateModelGroup::setName(const QString &name)
 }
 
 /*!
-    \qmlproperty int QtQml.Models2::DelegateModelGroup::count
+    \qmlproperty int QtQml.Models::DelegateModelGroup::count
 
     This property holds the number of items in the group.
 */
@@ -2319,7 +2319,7 @@ int QQmlDelegateModelGroup::count() const
 }
 
 /*!
-    \qmlproperty bool QtQml.Models2::DelegateModelGroup::includeByDefault
+    \qmlproperty bool QtQml.Models::DelegateModelGroup::includeByDefault
 
     This property holds whether new items are assigned to this group by default.
 */
@@ -2347,7 +2347,7 @@ void QQmlDelegateModelGroup::setDefaultInclude(bool include)
 }
 
 /*!
-    \qmlmethod object QtQml.Models2::DelegateModelGroup::get(int index)
+    \qmlmethod object QtQml.Models::DelegateModelGroup::get(int index)
 
     Returns a javascript object describing the item at \a index in the group.
 
@@ -2359,9 +2359,9 @@ void QQmlDelegateModelGroup::setDefaultInclude(bool include)
     a delegate
     \li \b groups A list the of names of groups the item is a member of.  This property can be
     written to change the item's membership.
-    \li \b inItems Whether the item belongs to the \l {QtQml.Models2::DelegateModel::items}{items} group.
+    \li \b inItems Whether the item belongs to the \l {QtQml.Models::DelegateModel::items}{items} group.
     Writing to this property will add or remove the item from the group.
-    \li \b itemsIndex The index of the item within the \l {QtQml.Models2::DelegateModel::items}{items} group.
+    \li \b itemsIndex The index of the item within the \l {QtQml.Models::DelegateModel::items}{items} group.
     \li \b {in<GroupName>} Whether the item belongs to the dynamic group \e groupName.  Writing to
     this property will add or remove the item from the group.
     \li \b {<groupName>Index} The index of the item within the dynamic group \e groupName.
@@ -2441,8 +2441,8 @@ bool QQmlDelegateModelGroupPrivate::parseIndex(const QV4::ValueRef value, int *i
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::insert(int index, jsdict data, array groups = undefined)
-    \qmlmethod QtQml.Models2::DelegateModelGroup::insert(jsdict data, var groups = undefined)
+    \qmlmethod QtQml.Models::DelegateModelGroup::insert(int index, jsdict data, array groups = undefined)
+    \qmlmethod QtQml.Models::DelegateModelGroup::insert(jsdict data, var groups = undefined)
 
     Creates a new entry at \a index in a DelegateModel with the values from \a data that
     correspond to roles in the model assigned to DelegateModel::model.
@@ -2500,9 +2500,9 @@ void QQmlDelegateModelGroup::insert(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::create(int index)
-    \qmlmethod QtQml.Models2::DelegateModelGroup::create(int index, jsdict data, array groups = undefined)
-    \qmlmethod QtQml.Models2::DelegateModelGroup::create(jsdict data, array groups = undefined)
+    \qmlmethod QtQml.Models::DelegateModelGroup::create(int index)
+    \qmlmethod QtQml.Models::DelegateModelGroup::create(int index, jsdict data, array groups = undefined)
+    \qmlmethod QtQml.Models::DelegateModelGroup::create(jsdict data, array groups = undefined)
 
     Returns a reference to the instantiated item at \a index in the group.
 
@@ -2512,7 +2512,7 @@ void QQmlDelegateModelGroup::insert(QQmlV4Function *args)
     was called on.
 
     All items returned by create are added to the
-    \l {QtQml.Models2::DelegateModel::persistedItems}{persistedItems} group.  Items in this
+    \l {QtQml.Models::DelegateModel::persistedItems}{persistedItems} group.  Items in this
     group remain instantiated when not referenced by any view.
 */
 
@@ -2576,7 +2576,7 @@ void QQmlDelegateModelGroup::create(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::resolve(int from, int to)
+    \qmlmethod QtQml.Models::DelegateModelGroup::resolve(int from, int to)
 
     Binds an unresolved item at \a from to an item in DelegateModel::model at index \a to.
 
@@ -2687,7 +2687,7 @@ void QQmlDelegateModelGroup::resolve(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::remove(int index, int count)
+    \qmlmethod QtQml.Models::DelegateModelGroup::remove(int index, int count)
 
     Removes \a count items starting at \a index from the group.
 */
@@ -2761,7 +2761,7 @@ bool QQmlDelegateModelGroupPrivate::parseGroupArgs(
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::addGroups(int index, int count, stringlist groups)
+    \qmlmethod QtQml.Models::DelegateModelGroup::addGroups(int index, int count, stringlist groups)
 
     Adds \a count items starting at \a index to \a groups.
 */
@@ -2791,7 +2791,7 @@ void QQmlDelegateModelGroup::addGroups(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::removeGroups(int index, int count, stringlist groups)
+    \qmlmethod QtQml.Models::DelegateModelGroup::removeGroups(int index, int count, stringlist groups)
 
     Removes \a count items starting at \a index from \a groups.
 */
@@ -2821,7 +2821,7 @@ void QQmlDelegateModelGroup::removeGroups(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::setGroups(int index, int count, stringlist groups)
+    \qmlmethod QtQml.Models::DelegateModelGroup::setGroups(int index, int count, stringlist groups)
 
     Sets the \a groups \a count items starting at \a index belong to.
 */
@@ -2851,13 +2851,13 @@ void QQmlDelegateModelGroup::setGroups(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::setGroups(int index, int count, stringlist groups)
+    \qmlmethod QtQml.Models::DelegateModelGroup::setGroups(int index, int count, stringlist groups)
 
     Sets the \a groups \a count items starting at \a index belong to.
 */
 
 /*!
-    \qmlmethod QtQml.Models2::DelegateModelGroup::move(var from, var to, int count)
+    \qmlmethod QtQml.Models::DelegateModelGroup::move(var from, var to, int count)
 
     Moves \a count at \a from in a group \a to a new position.
 */
@@ -2914,7 +2914,7 @@ void QQmlDelegateModelGroup::move(QQmlV4Function *args)
 }
 
 /*!
-    \qmlsignal QtQml.Models2::DelegateModelGroup::onChanged(array removed, array inserted)
+    \qmlsignal QtQml.Models::DelegateModelGroup::onChanged(array removed, array inserted)
 
     This handler is called when items have been removed from or inserted into the group.
 
diff --git a/src/qml/types/qqmlinstantiator.cpp b/src/qml/types/qqmlinstantiator.cpp
index 4173813154..f7b2f9254a 100644
--- a/src/qml/types/qqmlinstantiator.cpp
+++ b/src/qml/types/qqmlinstantiator.cpp
@@ -212,7 +212,7 @@ QQmlInstantiator::~QQmlInstantiator()
 }
 
 /*!
-    \qmlsignal QtQml2::Instantiator::onObjectAdded(int index, QtObject object)
+    \qmlsignal QtQml::Instantiator::onObjectAdded(int index, QtObject object)
 
     This handler is called when an object is added to the Instantiator. The \a index
     parameter holds the index which the object has been given, and the \a object
@@ -220,7 +220,7 @@ QQmlInstantiator::~QQmlInstantiator()
 */
 
 /*!
-    \qmlsignal QtQml2::Instantiator::onObjectRemoved(int index, QtObject object)
+    \qmlsignal QtQml::Instantiator::onObjectRemoved(int index, QtObject object)
 
     This handler is called when an object is added to the Instantiator. The \a index
     parameter holds the index which the object had been given, and the \a object
@@ -230,7 +230,7 @@ QQmlInstantiator::~QQmlInstantiator()
     in these cases it will be deleted shortly after the handler is called.
 */
 /*!
-    \qmlproperty bool QtQml2::Instantiator::active
+    \qmlproperty bool QtQml::Instantiator::active
 
     When active is true, and the delegate component is ready, the Instantiator will
     create objects according to the model. When active is false, no objects
@@ -255,7 +255,7 @@ void QQmlInstantiator::setActive(bool newVal)
 }
 
 /*!
-    \qmlproperty bool QtQml2::Instantiator::asynchronous
+    \qmlproperty bool QtQml::Instantiator::asynchronous
 
     When asynchronous is true the Instantiator will attempt to create objects
     asynchronously. This means that objects may not be available immediately,
@@ -282,7 +282,7 @@ void QQmlInstantiator::setAsync(bool newVal)
 
 
 /*!
-    \qmlproperty int QtQml2::Instantiator::count
+    \qmlproperty int QtQml::Instantiator::count
 
     The number of objects the Instantiator is currently managing.
 */
@@ -294,7 +294,7 @@ int QQmlInstantiator::count() const
 }
 
 /*!
-    \qmlproperty QtQml2::Component QtQml2::Instantiator::delegate
+    \qmlproperty QtQml::Component QtQml::Instantiator::delegate
     \default
 
     The component used to create all objects.
@@ -331,7 +331,7 @@ void QQmlInstantiator::setDelegate(QQmlComponent* c)
 }
 
 /*!
-    \qmlproperty variant QtQml2::Instantiator::model
+    \qmlproperty variant QtQml::Instantiator::model
 
     This property can be set to any of the supported \l {qml-data-models}{data models}:
 
@@ -405,7 +405,7 @@ void QQmlInstantiator::setModel(const QVariant &v)
 }
 
 /*!
-    \qmlproperty QtQml2::QtObject QtQml2::Instantiator::object
+    \qmlproperty QtQml::QtObject QtQml::Instantiator::object
 
     This is a reference to the first created object, intended as a convenience
     for the case where only one object has been created.
@@ -419,7 +419,7 @@ QObject *QQmlInstantiator::object() const
 }
 
 /*!
-    \qmlmethod QtQml2::QtObject QtQml2::Instantiator::objectAt
+    \qmlmethod QtQml::QtObject QtQml::Instantiator::objectAt
 
     Returns a reference to the object with the given \a index.
 */
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 3cf87bf7a3..d4dbae383d 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -181,7 +181,7 @@ public:
 
     For full details about the type, see the \l ObjectModel documentation.
 
-    \sa {QtQml.Models2::ObjectModel}
+    \sa {QtQml.Models::ObjectModel}
 */
 
 QQmlObjectModel::QQmlObjectModel(QObject *parent)
@@ -190,7 +190,7 @@ QQmlObjectModel::QQmlObjectModel(QObject *parent)
 }
 
 /*!
-    \qmlattachedproperty int QtQml.Models2::ObjectModel::index
+    \qmlattachedproperty int QtQml.Models::ObjectModel::index
     This attached property holds the index of this delegate's item within the model.
 
     It is attached to each instance of the delegate.
@@ -208,7 +208,7 @@ QQmlListProperty<QObject> QQmlObjectModel::children()
 }
 
 /*!
-    \qmlproperty int QtQml.Models2::ObjectModel::count
+    \qmlproperty int QtQml.Models::ObjectModel::count
 
     The number of items in the model.  This property is readonly.
 */
diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp
index 71cce6051f..7d1c41aeab 100644
--- a/src/qml/types/qqmltimer.cpp
+++ b/src/qml/types/qqmltimer.cpp
@@ -122,7 +122,7 @@ QQmlTimer::QQmlTimer(QObject *parent)
 }
 
 /*!
-    \qmlproperty int QtQml2::Timer::interval
+    \qmlproperty int QtQml::Timer::interval
 
     Sets the \a interval between triggers, in milliseconds.
 
@@ -145,7 +145,7 @@ int QQmlTimer::interval() const
 }
 
 /*!
-    \qmlproperty bool QtQml2::Timer::running
+    \qmlproperty bool QtQml::Timer::running
 
     If set to true, starts the timer; otherwise stops the timer.
     For a non-repeating timer, \a running is set to false after the
@@ -173,7 +173,7 @@ void QQmlTimer::setRunning(bool running)
 }
 
 /*!
-    \qmlproperty bool QtQml2::Timer::repeat
+    \qmlproperty bool QtQml::Timer::repeat
 
     If \a repeat is true the timer is triggered repeatedly at the
     specified interval; otherwise, the timer will trigger once at the
@@ -200,7 +200,7 @@ void QQmlTimer::setRepeating(bool repeating)
 }
 
 /*!
-    \qmlproperty bool QtQml2::Timer::triggeredOnStart
+    \qmlproperty bool QtQml::Timer::triggeredOnStart
 
     When a timer is started, the first trigger is usually after the specified
     interval has elapsed.  It is sometimes desirable to trigger immediately
@@ -233,7 +233,7 @@ void QQmlTimer::setTriggeredOnStart(bool triggeredOnStart)
 }
 
 /*!
-    \qmlmethod QtQml2::Timer::start()
+    \qmlmethod QtQml::Timer::start()
     \brief Starts the timer
 
     If the timer is already running, calling this method has no effect.  The
@@ -245,7 +245,7 @@ void QQmlTimer::start()
 }
 
 /*!
-    \qmlmethod QtQml2::Timer::stop()
+    \qmlmethod QtQml::Timer::stop()
     \brief Stops the timer
 
     If the timer is not running, calling this method has no effect.  The
@@ -257,7 +257,7 @@ void QQmlTimer::stop()
 }
 
 /*!
-    \qmlmethod QtQml2::Timer::restart()
+    \qmlmethod QtQml::Timer::restart()
     \brief Restarts the timer
 
     If the Timer is not running it will be started, otherwise it will be
@@ -302,7 +302,7 @@ void QQmlTimer::componentComplete()
 }
 
 /*!
-    \qmlsignal QtQml2::Timer::onTriggered()
+    \qmlsignal QtQml::Timer::onTriggered()
 
     This handler is called when the Timer is triggered.
 */
diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp
index e013a0dd37..2ce9ca36d8 100644
--- a/src/qml/types/qquickpackage.cpp
+++ b/src/qml/types/qquickpackage.cpp
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlattachedproperty string QtQuick2::Package::name
+    \qmlattachedproperty string QtQuick::Package::name
     This attached property holds the name of an item within a Package.
 */