1 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 7c7ac124f0..97736355d4 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -612,7 +612,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{QML:Qt::formatDateTime()}{Qt.formatDateTime()}.
+\l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 If \a format is not specified, \a date is formatted using
 \l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
@@ -655,7 +655,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{QML:Qt::formatDateTime()}{Qt.formatDateTime()}.
+described for \l{QtQml2::Qt::formatDateTime()}{Qt.formatDateTime()}.
 
 If \a format is not specified, \a time is formatted using
 \l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
@@ -773,7 +773,7 @@ For example, if the following date/time value was specified:
     \endcode
 
 This \a dateTime value could be passed to \c Qt.formatDateTime(),
-\l {QML:Qt::formatDate()}{Qt.formatDate()} or \l {QML:Qt::formatTime()}{Qt.formatTime()}
+\l {QtQml2::Qt::formatDate()}{Qt.formatDate()} or \l {QtQml2::Qt::formatTime()}{Qt.formatTime()}
 with the \a format values below to produce the following results:
 
     \table
@@ -934,7 +934,7 @@ Example (where \c parentItem is the id of an existing QML item):
 
 \snippet qml/createQmlObject.qml 0
 
-In the case of an error, a QtScript Error object is thrown. This object has an additional property,
+In the case of an error, a \l {Qt Script} Error object is thrown. This object has an additional property,
 \c qmlErrors, which is an array of the errors encountered.
 Each object in this array has the members \c lineNumber, \c columnNumber, \c fileName and \c message.
 For example, if the above snippet had misspelled color as 'colro' then the array would contain an object like the following:
@@ -942,7 +942,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{QML:Qt::createComponent()}{Qt.createComponent()} instead.
+If this is the case, consider using \l{QtQml2::Qt::createComponent()}{Qt.createComponent()} instead.
 
 See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function.
 */
@@ -1070,7 +1070,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{QML:Qt::createQmlObject()}{Qt.createQmlObject()}.
+use \l{QtQml2::Qt::createQmlObject()}{Qt.createQmlObject()}.
 */
 Value QtObject::method_createComponent(SimpleCallContext *ctx)
 {
@@ -1243,9 +1243,9 @@ DEFINE_MANAGED_VTABLE(BindingFunction);
 
     \snippet qml/qtBinding.4.qml 0
 
-    Note: in QtQuick 1.x, all function assignment was treated as
+    \note In \l {Qt Quick 1}, all function assignment was treated as
     binding assignment, so the Qt.binding() function is new in
-    QtQuick 2.0.
+    \l {Qt Quick}{Qt Quick 2}.
 
     \since QtQuick 2.0
 */
@@ -1613,7 +1613,7 @@ void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject)
     Example:
     \snippet qml/qsTranslate.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx)
 {
@@ -1669,7 +1669,7 @@ Value GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx)
     Example:
     \snippet qml/qtTranslateNoOp.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx)
 {
@@ -1693,7 +1693,7 @@ Value GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx)
     Example:
     \snippet qml/qsTr.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTr(SimpleCallContext *ctx)
 {
@@ -1747,7 +1747,7 @@ Value GlobalExtensions::method_qsTr(SimpleCallContext *ctx)
     Example:
     \snippet qml/qtTrNoOp.qml 0
 
-    \sa {Localization And Internationalization Support In Qt Quick}
+    \sa {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx)
 {
@@ -1784,7 +1784,7 @@ Value GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx)
     Creating binary translation (QM) files suitable for use with this function requires passing
     the \c -idbased option to the \c lrelease tool.
 
-    \sa QT_TRID_NOOP, {Localization And Internationalization Support In Qt Quick}
+    \sa QT_TRID_NOOP, {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTrId(SimpleCallContext *ctx)
 {
@@ -1816,7 +1816,7 @@ Value GlobalExtensions::method_qsTrId(SimpleCallContext *ctx)
     Example:
     \snippet qml/qtTrIdNoOp.qml 0
 
-    \sa qsTrId(), {Localization And Internationalization Support In Qt Quick}
+    \sa qsTrId(), {Internationalization and Localization with Qt Quick}
 */
 Value GlobalExtensions::method_qsTrIdNoOp(SimpleCallContext *ctx)
 {