diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
| commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
| tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /src/qml/qml/v8 | |
| parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
| parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'src/qml/qml/v8')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 41d5de0862..0409b92e89 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1157,7 +1157,7 @@ ReturnedValue QtObject::method_createComponent(CallContext *ctx) is not present, or is not a valid ISO 3166 code, the most appropriate country is chosen for the specified language. - \sa QtQuick::Locale + \sa Locale */ ReturnedValue QtObject::method_locale(CallContext *ctx) { @@ -1801,7 +1801,7 @@ ReturnedValue GlobalExtensions::method_qsTrNoOp(CallContext *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, {Internationalization and Localization with Qt Quick} + \sa QT_TRID_NOOP(), {Internationalization and Localization with Qt Quick} */ ReturnedValue GlobalExtensions::method_qsTrId(CallContext *ctx) { |