summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-07-27 17:38:59 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-31 15:32:39 +0200
commit0fe5da934167585ad7ae0865afac361abf98b885 (patch)
tree2049e550fc5bf38fbad4b500dd40cfd04b1893ac
parent61e05e8d2c8f7fe80022b05bcfefa6f1fa4af356 (diff)
Doc: Changed \qmlclass to \qmltype and added \instantiates
-\qmlclass is now \qmltype -\instantiates is for QML types that are implemented in C++. Change-Id: I2f739bc54785e26ce4d6c0774c10f29dee35805b Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
-rw-r--r--src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp3
-rw-r--r--src/imports/bluetooth/qdeclarativebluetoothservice.cpp3
-rw-r--r--src/imports/bluetooth/qdeclarativebluetoothsocket.cpp3
-rw-r--r--src/imports/nfc/qdeclarativendeffilter.cpp3
-rw-r--r--src/imports/nfc/qdeclarativendefmimerecord.cpp3
-rw-r--r--src/imports/nfc/qdeclarativendeftextrecord.cpp3
-rw-r--r--src/imports/nfc/qdeclarativendefurirecord.cpp3
-rw-r--r--src/imports/nfc/qdeclarativenearfield.cpp3
-rw-r--r--src/imports/nfc/qdeclarativenearfieldsocket.cpp3
-rw-r--r--src/nfc/qdeclarativendefrecord.cpp3
10 files changed, 20 insertions, 10 deletions
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index 4a844d1d..5c05ae6f 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -49,7 +49,8 @@
#include "qdeclarativebluetoothservice_p.h"
/*!
- \qmlclass BluetoothDiscoveryModel QDeclarativeBluetoothDiscoveryModel
+ \qmltype BluetoothDiscoveryModel
+ \instantiates QDeclarativeBluetoothDiscoveryModel
\brief Enables you to search for the Bluetooth devices and services in range.
\ingroup bluetooth-qml
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index 37b3d991..331908e4 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -52,7 +52,8 @@
/* ==================== QDeclarativeBluetoothService ======================= */
/*!
- \qmlclass BluetoothService QDeclarativeBluetoothService
+ \qmltype BluetoothService
+ \instantiates QDeclarativeBluetoothService
\brief Provides information about a particular Bluetooth service.
\ingroup bluetooth-qml
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index 4d366042..bf9d1a77 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -56,7 +56,8 @@
/* ==================== QDeclarativeBluetoothSocket ======================= */
/*!
- \qmlclass BluetoothSocket QDeclarativeBluetoothSocket
+ \qmltype BluetoothSocket
+ \instantiates QDeclarativeBluetoothSocket
\brief Enables you to connect and communicate with a Bluetooth service or device.
\ingroup bluetooth-qml
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index 25c97fe9..f7ea181f 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -42,7 +42,8 @@
#include "qdeclarativendeffilter_p.h"
/*!
- \qmlclass NdefFilter QDeclarativeNdefFilter
+ \qmltype NdefFilter
+ \instantiates QDeclarativeNdefFilter
\brief The NdefFilter type represents a filtering constraint for NDEF message records.
\ingroup nfc-qml
diff --git a/src/imports/nfc/qdeclarativendefmimerecord.cpp b/src/imports/nfc/qdeclarativendefmimerecord.cpp
index a7b5fc2b..bcf0169e 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord.cpp
+++ b/src/imports/nfc/qdeclarativendefmimerecord.cpp
@@ -42,7 +42,8 @@
#include "qdeclarativendefmimerecord_p.h"
/*!
- \qmlclass NdefMimeRecord QDeclarativeNdefMimeRecord
+ \qmltype NdefMimeRecord
+ \instantiates QDeclarativeNdefMimeRecord
\brief The NdefMimeRecord type represents an NFC MIME record.
\ingroup connectivity-nfc
diff --git a/src/imports/nfc/qdeclarativendeftextrecord.cpp b/src/imports/nfc/qdeclarativendeftextrecord.cpp
index a94269cb..14187ecf 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord.cpp
+++ b/src/imports/nfc/qdeclarativendeftextrecord.cpp
@@ -44,7 +44,8 @@
#include <QtCore/QLocale>
/*!
- \qmlclass NdefTextRecord QDeclarativeNdefTextRecord
+ \qmltype NdefTextRecord
+ \instantiates QDeclarativeNdefTextRecord
\brief The NdefTextRecord type represents an NFC RTD-Text NDEF record.
\ingroup nfc-qml
diff --git a/src/imports/nfc/qdeclarativendefurirecord.cpp b/src/imports/nfc/qdeclarativendefurirecord.cpp
index 18b72bf8..c172f5c3 100644
--- a/src/imports/nfc/qdeclarativendefurirecord.cpp
+++ b/src/imports/nfc/qdeclarativendefurirecord.cpp
@@ -44,7 +44,8 @@
#include <QtCore/QUrl>
/*!
- \qmlclass NdefUriRecord QDeclarativeNdefUriRecord
+ \qmltype NdefUriRecord
+ \instantiates QDeclarativeNdefUriRecord
\brief The NdefUriRecord type represents an NFC RTD-URI NDEF record.
\ingroup nfc-qml
diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp
index e510e8ae..4fd903a2 100644
--- a/src/imports/nfc/qdeclarativenearfield.cpp
+++ b/src/imports/nfc/qdeclarativenearfield.cpp
@@ -50,7 +50,8 @@
#include <qndefnfcurirecord.h>
/*!
- \qmlclass NearField QDeclarativeNearField
+ \qmltype NearField
+ \instantiates QDeclarativeNearField
\brief The NearField type provides access to NDEF messages stored on NFC Forum tags.
\ingroup nfc-qml
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket.cpp b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
index c1b225ef..5fccd71b 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket.cpp
+++ b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
@@ -44,7 +44,8 @@
#include <qllcpserver.h>
/*!
- \qmlclass NearFieldSocket QDeclarativeNearFieldSocket
+ \qmltype NearFieldSocket
+ \instantiates QDeclarativeNearFieldSocket
\brief The NearFieldSocket type represents an LLCP socket.
\ingroup nfc-qml
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp
index 113e13e6..22a820ae 100644
--- a/src/nfc/qdeclarativendefrecord.cpp
+++ b/src/nfc/qdeclarativendefrecord.cpp
@@ -85,7 +85,8 @@ QTNFC_BEGIN_NAMESPACE
*/
/*!
- \qmlclass NdefRecord QDeclarativeNdefRecord
+ \qmltype NdefRecord
+ \instantiates QDeclarativeNdefRecord
\brief The NdefRecord type represents a record in an NDEF message.
\ingroup nfc-qml