diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2012-07-27 17:18:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 11:11:56 +0200 |
| commit | 2d3584ff21b8ddd8186972d52ecf189d0963febc (patch) | |
| tree | 689f7770a5d49b9a39a3ef9ac03aa67bdb37f52b /src/qml/qml | |
| parent | e7b90ea3107996fb4a1b410631e0650d2d704912 (diff) | |
Doc: Changed \qmlclass to \qmltype and added \instantiates.
-To simplify QDoc, \qmlclass is now \qmltype.
-'\instantiates <C+++ class>' is for the types that are defined in C++.
Change-Id: I29242d33daf7b972d8b86a356b9689638866b950
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 3 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 3 | ||||
| -rw-r--r-- | src/qml/qml/qquicklistmodel.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qquickworkerscript.cpp | 3 |
5 files changed, 14 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index ac3eee8d05..b1715f1c70 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -190,7 +190,8 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) */ /*! - \qmlclass Component QQmlComponent + \qmltype Component + \instantiates QQmlComponent \ingroup qml-utility-elements \since 4.7 \inqmlmodule QtQuick 2 diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index f9b261b314..72c1c35244 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -109,7 +109,8 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor) } /*! - \qmlclass QtObject QObject + \qmltype QtObject + \instantiates QObject \inqmlmodule QtQuick 2 \ingroup qml-utility-elements \since 4.7 @@ -241,7 +242,8 @@ QQmlImageProviderBase::~QQmlImageProviderBase() /*! -\qmlclass Qt QQmlEnginePrivate +\qmltype Qt + \instantiates QQmlEnginePrivate \ingroup qml-utility-elements \brief The QML global Qt object provides useful enums and functions from Qt. diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 9a2ec6f0e3..e323c804a1 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -764,7 +764,8 @@ QV8LocaleDataDeletable::~QV8LocaleDataDeletable() V8_DEFINE_EXTENSION(QV8LocaleDataDeletable, localeV8Data); /*! - \qmlclass Locale QQmlLocale + \qmltype Locale + \instantiates QQmlLocale \inqmlmodule QtQuick 2 \brief Provides locale specific properties and formatted data diff --git a/src/qml/qml/qquicklistmodel.cpp b/src/qml/qml/qquicklistmodel.cpp index 11aa372ee5..a3e2456fb7 100644 --- a/src/qml/qml/qquicklistmodel.cpp +++ b/src/qml/qml/qquicklistmodel.cpp @@ -1423,7 +1423,8 @@ QQuickListModelParser::ListInstruction *QQuickListModelParser::ListModelData::in } /*! - \qmlclass ListModel QQuickListModel + \qmltype ListModel + \instantiates QQuickListModel \inqmlmodule QtQuick 2 \brief Defines a free-form list data source \ingroup qtquick-models @@ -2521,7 +2522,8 @@ bool QQuickListModelParser::definesEmptyList(const QString &s) /*! - \qmlclass ListElement QQuickListElement + \qmltype ListElement + \instantiates QQuickListElement \inqmlmodule QtQuick 2 \brief Defines a data item in a ListModel \ingroup qtquick-models diff --git a/src/qml/qml/qquickworkerscript.cpp b/src/qml/qml/qquickworkerscript.cpp index 84cbdbba3f..96ddf908f3 100644 --- a/src/qml/qml/qquickworkerscript.cpp +++ b/src/qml/qml/qquickworkerscript.cpp @@ -560,7 +560,8 @@ void QQuickWorkerScriptEngine::run() /*! - \qmlclass WorkerScript QQuickWorkerScript + \qmltype WorkerScript + \instantiates QQuickWorkerScript \ingroup qtquick-threading \inqmlmodule QtQuick 2 \brief Enables the use of threads in a Qt Quick application |