Doc: Changed \qmlclass to \qmltype and added \instantiates

-New qdoc command \qmltype replaces \qmlclass
-\instantiates <C++ class> for determining if the QML type has a C++
implementation

Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8
Reviewed-by: Martin Smith <martin.smith@nokia.com>

13 files changed, 27 insertions, 14 deletions

diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml
index b0454d7ce..bd9ef3738 100644
--- a/src/imports/multimedia/Video.qml
+++ b/src/imports/multimedia/Video.qml
@@ -43,7 +43,7 @@ import QtQuick 2.0
 import QtMultimedia 5.0
 
 /*!
-    \qmlclass Video
+    \qmltype Video
     \inherits Item
     \ingroup multimedia_qml
     \ingroup multimedia_video_qml
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index e9fda4f5a..797542ad0 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -57,7 +57,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Audio QDeclarativeAudio
+    \qmltype Audio
+    \instantiates QDeclarativeAudio
     \brief Add audio playback to a scene.
 
     \inqmlmodule QtMultimedia 5.0
@@ -1118,7 +1119,8 @@ void QDeclarativeAudio::_q_statusChanged()
 ///////////// MediaPlayer Docs /////////////
 
 /*!
-    \qmlclass MediaPlayer QDeclarativeAudio
+    \qmltype MediaPlayer
+    \instantiates QDeclarativeAudio
     \brief Add media playback to a scene.
 
     \inqmlmodule QtMultimedia 5.0
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index d1219add1..b082b55d0 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -74,7 +74,8 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityStatus
 }
 
 /*!
-    \qmlclass Camera QDeclarativeCamera
+    \qmltype Camera
+    \instantiates QDeclarativeCamera
     \brief Access viewfinder frames, and take photos and movies.
     \ingroup multimedia_qml
     \ingroup camera_qml
diff --git a/src/imports/multimedia/qdeclarativecameracapture.cpp b/src/imports/multimedia/qdeclarativecameracapture.cpp
index 663a805f1..f5a072f16 100644
--- a/src/imports/multimedia/qdeclarativecameracapture.cpp
+++ b/src/imports/multimedia/qdeclarativecameracapture.cpp
@@ -50,7 +50,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraCapture QDeclarativeCameraCapture
+    \qmltype CameraCapture
+    \instantiates QDeclarativeCameraCapture
     \brief An interface for capturing camera images
     \ingroup multimedia_qml
     \inqmlmodule QtMultimedia 5.0
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index 0388085d5..e9b7f880b 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraExposure QDeclarativeCameraExposure
+    \qmltype CameraExposure
+    \instantiates QDeclarativeCameraExposure
     \brief An interface for exposure related camera settings.
     \ingroup multimedia_qml
     \ingroup camera_qml
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index 7048a2cd9..fb1256319 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraFlash QDeclarativeCameraFlash
+    \qmltype CameraFlash
+    \instantiates QDeclarativeCameraFlash
     \inqmlmodule QtMultimedia 5.0
     \brief An interface for flash related camera settings.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 70a737ca1..80fa9ce20 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraFocus QDeclarativeCameraFocus
+    \qmltype CameraFocus
+    \instantiates QDeclarativeCameraFocus
     \inqmlmodule QtMultimedia 5.0
     \brief An interface for focus related camera settings.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index 88e82f976..294b20dc6 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraImageProcessing QDeclarativeCameraImageProcessing
+    \qmltype CameraImageProcessing
+    \instantiates QDeclarativeCameraImageProcessing
     \inqmlmodule QtMultimedia 5.0
     \brief An interface for camera capture related settings.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativecamerarecorder.cpp b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
index 52742493b..ccf87a219 100644
--- a/src/imports/multimedia/qdeclarativecamerarecorder.cpp
+++ b/src/imports/multimedia/qdeclarativecamerarecorder.cpp
@@ -47,7 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass CameraRecorder QDeclarativeCameraRecorder
+    \qmltype CameraRecorder
+    \instantiates QDeclarativeCameraRecorder
     \inqmlmodule QtMultimedia 5.0
     \brief Controls video recording with the Camera.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 74d7d496c..e76a1f07b 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -45,7 +45,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Radio QDeclarativeRadio
+    \qmltype Radio
+    \instantiates QDeclarativeRadio
     \inqmlmodule QtMultimedia 5.0
     \brief Access radio functionality from a QML application.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index b03579ec1..4b9300161 100644
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -44,7 +44,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass RadioData QDeclarativeRadioData
+    \qmltype RadioData
+    \instantiates QDeclarativeRadioData
     \inqmlmodule QtMultimedia 5.0
     \brief Access RDS data from a QML application.
     \ingroup multimedia_qml
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp
index 743877347..b884a2f33 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -47,7 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass Torch QDeclarativeTorch
+    \qmltype Torch
+    \instantiates QDeclarativeTorch
     \inqmlmodule QtMultimedia 5.0
     \brief Simple control over torch functionality
 
diff --git a/src/imports/multimedia/qdeclarativevideooutput.cpp b/src/imports/multimedia/qdeclarativevideooutput.cpp
index fc996f453..9873083a5 100644
--- a/src/imports/multimedia/qdeclarativevideooutput.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput.cpp
@@ -51,7 +51,8 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \qmlclass VideoOutput QDeclarativeVideoOutput
+    \qmltype VideoOutput
+    \instantiates QDeclarativeVideoOutput
     \brief Render video or camera viewfinder.
 
     \ingroup multimedia_qml