diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2013-05-14 12:41:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-15 09:32:58 +0200 |
| commit | ebbb0257e65b762ac6c3cf2baa19bbb5d581d071 (patch) | |
| tree | 57f4b9df9881043b34a57e0718c9d28a0e7ba3f7 /src/qml/qml/qqmllocale.cpp | |
| parent | 56da72fb219356d2948e9adae3f3a17553fc7add (diff) | |
Doc: Define Qt global object as a QML type and fix referring docs
This change adds the Qt global object as a QML type in the Qt QML module
and fixes links to it in documentation.
Task-number: QTBUG-29353
Change-Id: I1690224091a79a3309fac7a78aa0c0c734449e4f
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 15ddcc7c29..194a5ca7e7 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -772,10 +772,10 @@ V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data); \inqmlmodule QtQml 2 \brief Provides locale specific properties and formatted data - The Locale object may only be created via the \l{QML:Qt::locale()}{Qt.locale()} function. + The Locale object may only be created via the \l{QtQml2::Qt::locale()}{Qt.locale()} function. It cannot be created directly. - The \l{QML:Qt::locale()}{Qt.locale()} function returns a JS Locale object representing the + The \l{QtQml2::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". |