Merge branch 'stable' into dev

Conflicts:
	src/qml/qml/v8/qqmlbuiltinfunctions.cpp
	tests/auto/qml/qml.pro

Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2

1 files changed, 29 insertions, 29 deletions

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 5e7116e271..405411e65c 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -798,7 +798,7 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data);
     This product includes software developed by the University of
     California, Berkeley and its contributors.
 
-    \sa {QtQuick2::Date}{Date}, {QtQuick2::Number}{Number}
+    \sa Date, Number
 */
 
 QQmlLocale::QQmlLocale()
@@ -840,7 +840,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 }
 
 /*!
-    \qmlproperty string QtQuick2::Locale::name
+    \qmlproperty string QtQml2::Locale::name
 
     Holds the language and country of this locale as a
     string of the form "language_country", where
@@ -849,77 +849,77 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::decimalPoint
+    \qmlproperty string QtQml2::Locale::decimalPoint
 
     Holds the decimal point character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::groupSeparator
+    \qmlproperty string QtQml2::Locale::groupSeparator
 
     Holds the group separator character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::percent
+    \qmlproperty string QtQml2::Locale::percent
 
     Holds the percent character of this locale.
 */
 
 
 /*!
-    \qmlproperty string QtQuick2::Locale::zeroDigit
+    \qmlproperty string QtQml2::Locale::zeroDigit
 
     Holds Returns the zero digit character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::negativeSign
+    \qmlproperty string QtQml2::Locale::negativeSign
 
     Holds the negative sign character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::positiveSign
+    \qmlproperty string QtQml2::Locale::positiveSign
 
     Holds the positive sign character of this locale.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::exponential
+    \qmlproperty string QtQml2::Locale::exponential
 
     Holds the exponential character of this locale.
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::dateTimeFormat(type)
+    \qmlmethod string QtQml2::Locale::dateTimeFormat(type)
 
     Returns the date time format used for the current locale.
     \a type specifies the FormatType to return.
 
-    \sa {QtQuick2::Date}{Date}
+    \sa Date
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::dateFormat(type)
+    \qmlmethod string QtQml2::Locale::dateFormat(type)
 
     Returns the date format used for the current locale.
     \a type specifies the FormatType to return.
 
-    \sa {QtQuick2::Date}{Date}
+    \sa Date
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::timeFormat(type)
+    \qmlmethod string QtQml2::Locale::timeFormat(type)
 
     Returns the time format used for the current locale.
     \a type specifies the FormatType to return.
 
-    \sa {QtQuick2::Date}{Date}
+    \sa Date
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::monthName(month, type)
+    \qmlmethod string QtQml2::Locale::monthName(month, type)
 
     Returns the localized name of \a month (0-11), in the optional
     \l FormatType specified by \a type.
@@ -931,7 +931,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::standaloneMonthName(month, type)
+    \qmlmethod string QtQml2::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.
@@ -946,7 +946,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::dayName(day, type)
+    \qmlmethod string QtQml2::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
@@ -956,7 +956,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::standaloneDayName(day, type)
+    \qmlmethod string QtQml2::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
@@ -969,7 +969,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQuick2::Locale::firstDayOfWeek
+    \qmlproperty enumeration QtQml2::Locale::firstDayOfWeek
 
     Holds the first day of the week according to the current locale.
 
@@ -988,7 +988,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty Array<int> QtQuick2::Locale::weekDays
+    \qmlproperty Array<int> QtQml2::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.
@@ -997,7 +997,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty Array<string> QtQuick2::Locale::uiLanguages
+    \qmlproperty Array<string> QtQml2::Locale::uiLanguages
 
     Returns an ordered list of locale names for translation purposes in
     preference order.
@@ -1009,7 +1009,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQuick2::Locale::textDirection
+    \qmlproperty enumeration QtQml2::Locale::textDirection
 
     Holds the text direction of the language:
     \list
@@ -1019,19 +1019,19 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::amText
+    \qmlproperty string QtQml2::Locale::amText
 
     The localized name of the "AM" suffix for times specified using the conventions of the 12-hour clock.
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::pmText
+    \qmlproperty string QtQml2::Locale::pmText
 
     The localized name of the "PM" suffix for times specified using the conventions of the 12-hour clock.
 */
 
 /*!
-    \qmlmethod string QtQuick2::Locale::currencySymbol(format)
+    \qmlmethod string QtQml2::Locale::currencySymbol(format)
 
     Returns the currency symbol for the specified \a format:
     \list
@@ -1043,7 +1043,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::nativeLanguageName
+    \qmlproperty string QtQml2::Locale::nativeLanguageName
 
     Holds a native name of the language for the locale. For example
     "Schwiizertüütsch" for Swiss-German locale.
@@ -1052,7 +1052,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty string QtQuick2::Locale::nativeCountryName
+    \qmlproperty string QtQml2::Locale::nativeCountryName
 
     Holds a native name of the country for the locale. For example
     "España" for Spanish/Spain locale.
@@ -1061,7 +1061,7 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx)
 */
 
 /*!
-    \qmlproperty enumeration QtQuick2::Locale::measurementSystem
+    \qmlproperty enumeration QtQml2::Locale::measurementSystem
 
     This property defines which units are used for measurement.