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>

3 files changed, 34 insertions, 34 deletions

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)
 {