diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-10-01 13:03:28 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 14:40:01 +0200 |
| commit | 4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch) | |
| tree | 43672217a945512ddd1704468d1fd4b6e9c153c7 /src/qml/qml/v8 | |
| parent | 4f50ab594aa2fb1d38981127beca634ad3396489 (diff) | |
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>
Diffstat (limited to 'src/qml/qml/v8')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |