diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2012-07-27 18:41:03 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-30 10:58:28 +0200 |
commit | 4d34cc5f70a1c5b9efeba509ae9b5df9342981a3 (patch) | |
tree | 0ca18f7566c60808830d57fb3efe5145a13c086d | |
parent | caa0d5ac7b105b00f79b5774eeb961495e4d071d (diff) |
Doc: Changed \qmlclass to \qmltype and added \instantiates
-\qmlclass is now \qmltype
-\instantiates is for QML types implemented in C++
Change-Id: Ide5853242f8cde0f4f2d9b99a7a43c150161e3d4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
11 files changed, 28 insertions, 14 deletions
diff --git a/src/imports/publishsubscribe/qdeclarativevaluespacepublisher.cpp b/src/imports/publishsubscribe/qdeclarativevaluespacepublisher.cpp index 61d8a774..c242ed9f 100644 --- a/src/imports/publishsubscribe/qdeclarativevaluespacepublisher.cpp +++ b/src/imports/publishsubscribe/qdeclarativevaluespacepublisher.cpp @@ -46,7 +46,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass ValueSpacePublisher QDeclarativeValueSpacePublisher + \qmltype ValueSpacePublisher + \instantiates QDeclarativeValueSpacePublisher \inqmlmodule QtPublishSubscribe 1.0 \ingroup qml-publishsubscribe diff --git a/src/imports/publishsubscribe/qdeclarativevaluespacesubscriber.cpp b/src/imports/publishsubscribe/qdeclarativevaluespacesubscriber.cpp index ad1c7bd1..0f1f7b97 100644 --- a/src/imports/publishsubscribe/qdeclarativevaluespacesubscriber.cpp +++ b/src/imports/publishsubscribe/qdeclarativevaluespacesubscriber.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass ValueSpaceSubscriber QDeclarativeValueSpaceSubscriber + \qmltype ValueSpaceSubscriber + \instantiates QDeclarativeValueSpaceSubscriber \inqmlmodule QtPublishSubscribe \ingroup qml-publishsubscribe diff --git a/src/imports/serviceframework/qdeclarativeservice.cpp b/src/imports/serviceframework/qdeclarativeservice.cpp index bdecd1ce..e3ce002c 100644 --- a/src/imports/serviceframework/qdeclarativeservice.cpp +++ b/src/imports/serviceframework/qdeclarativeservice.cpp @@ -49,7 +49,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass ServiceLoader QDeclarativeService + \qmltype ServiceLoader + \instantiates QDeclarativeService \brief The ServiceLoader element holds an instance of a service object. \inherits QObject @@ -289,7 +290,8 @@ void QDeclarativeServiceLoader::IPCFault(QService::UnrecoverableIPCError errorVa } /*! - \qmlclass ServiceDescriptor QDeclarativeServiceDescriptor + \qmltype ServiceDescriptor + \instantiates QDeclarativeServiceDescriptor \brief The ServiceDescriptor element holds a description of a service. \inherits QObject @@ -331,7 +333,8 @@ void QDeclarativeServiceLoader::IPCFault(QService::UnrecoverableIPCError errorVa I have no clue what this property does, but it's probably important. */ /*! - \qmlclass ServiceFilter QDeclarativeServiceFilter + \qmltype ServiceFilter + \instantiates QDeclarativeServiceFilter \brief The ServiceFilter element holds a list of \l ServiceDescriptor objects. \inherits QObject diff --git a/src/imports/serviceframework/qdeclarativeserviceold.cpp b/src/imports/serviceframework/qdeclarativeserviceold.cpp index d36477ea..6957927e 100644 --- a/src/imports/serviceframework/qdeclarativeserviceold.cpp +++ b/src/imports/serviceframework/qdeclarativeserviceold.cpp @@ -47,7 +47,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass Service QDeclarativeService + \qmltype Service + \instantiates QDeclarativeService \brief The Service element holds an instance of a service object. \inherits QObject @@ -314,7 +315,8 @@ bool QDeclarativeService::operator ==(const QServiceInterfaceDescriptor& other ) } /*! - \qmlclass ServiceList QDeclarativeServiceList + \qmltype ServiceList + \instantiates QDeclarativeServiceList \brief The ServiceList element holds a list of \l Service elements. \inherits QObject diff --git a/src/imports/systeminfo/qdeclarativebatteryinfo.cpp b/src/imports/systeminfo/qdeclarativebatteryinfo.cpp index 6125061c..fa6163aa 100644 --- a/src/imports/systeminfo/qdeclarativebatteryinfo.cpp +++ b/src/imports/systeminfo/qdeclarativebatteryinfo.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass BatteryInfo QDeclarativeBatteryInfo + \qmltype BatteryInfo + \instantiates QDeclarativeBatteryInfo \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The BatteryInfo element provides various information about the battery status. diff --git a/src/imports/systeminfo/qdeclarativedeviceinfo.cpp b/src/imports/systeminfo/qdeclarativedeviceinfo.cpp index b041bc8a..8f25bd5e 100644 --- a/src/imports/systeminfo/qdeclarativedeviceinfo.cpp +++ b/src/imports/systeminfo/qdeclarativedeviceinfo.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass DeviceInfo QDeclarativeDeviceInfo + \qmltype DeviceInfo + \instantiates QDeclarativeDeviceInfo \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The DeviceInfo element provides various information about the device. diff --git a/src/imports/systeminfo/qdeclarativedeviceprofile.cpp b/src/imports/systeminfo/qdeclarativedeviceprofile.cpp index c591c8f7..1f83bc35 100644 --- a/src/imports/systeminfo/qdeclarativedeviceprofile.cpp +++ b/src/imports/systeminfo/qdeclarativedeviceprofile.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass DeviceProfile QDeclarativeDeviceProfile + \qmltype DeviceProfile + \instantiates QDeclarativeDeviceProfile \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The DeviceProfile element provides information about the profile of the device. diff --git a/src/imports/systeminfo/qdeclarativedisplayinfo.cpp b/src/imports/systeminfo/qdeclarativedisplayinfo.cpp index 764bdc97..4bbf1e14 100644 --- a/src/imports/systeminfo/qdeclarativedisplayinfo.cpp +++ b/src/imports/systeminfo/qdeclarativedisplayinfo.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass DisplayInfo QDisplayInfo + \qmltype DisplayInfo + \instantiates QDisplayInfo \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The DisplayInfo element provides information about the display of the device. diff --git a/src/imports/systeminfo/qdeclarativenetworkinfo.cpp b/src/imports/systeminfo/qdeclarativenetworkinfo.cpp index 8d745b3e..4f8e5e68 100644 --- a/src/imports/systeminfo/qdeclarativenetworkinfo.cpp +++ b/src/imports/systeminfo/qdeclarativenetworkinfo.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass NetworkInfo QDeclarativeNetworkInfo + \qmltype NetworkInfo + \instantiates QDeclarativeNetworkInfo \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The NetworkInfo element provides various information about the network status. diff --git a/src/imports/systeminfo/qdeclarativestorageinfo.cpp b/src/imports/systeminfo/qdeclarativestorageinfo.cpp index 383109e5..cba7a2e6 100644 --- a/src/imports/systeminfo/qdeclarativestorageinfo.cpp +++ b/src/imports/systeminfo/qdeclarativestorageinfo.cpp @@ -44,7 +44,8 @@ QT_BEGIN_NAMESPACE /*! - \qmlclass StorageInfo QDeclarativeStorageInfo + \qmltype StorageInfo + \instantiates QDeclarativeStorageInfo \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The StorageInfo element provides various information about the storage system. diff --git a/src/imports/systeminfo/qsysteminfo.cpp b/src/imports/systeminfo/qsysteminfo.cpp index f3e2eeb8..4dbb55af 100644 --- a/src/imports/systeminfo/qsysteminfo.cpp +++ b/src/imports/systeminfo/qsysteminfo.cpp @@ -79,7 +79,8 @@ QT_END_NAMESPACE #include "qsysteminfo.moc" /*! - \qmlclass ScreenSaver QScreenSaver + \qmltype ScreenSaver + \instantiates QScreenSaver \inqmlmodule QtSystemInfo \ingroup qml-systeminfo \brief The ScreenSaver element provides information about the screen saver. |