diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-10 16:46:10 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-11 09:44:08 +0000 |
| commit | a00c588c70a6f4df6ddaf112a49e9fed763a29e2 (patch) | |
| tree | 1f681cd1c371fedc1a1f1fda53110942d2307353 /src/imports/multimedia/qdeclarativeaudio.cpp | |
| parent | 6684b4b23b2fd8a1fc4ae4f9b2f8bd90cd1e5846 (diff) | |
| download | qtmultimedia-a00c588c70a6f4df6ddaf112a49e9fed763a29e2.tar.gz | |
Improve documentation for mediaObject property.
In Camera and MediaPlayer types.
Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativeaudio.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index bb1af91db..17d57ffb7 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -774,19 +774,18 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia::Audio::metaData.title + \qmlproperty variant QtMultimedia::Audio::mediaObject - This property holds the title of the media. + This property holds the native media object. - \sa {QMediaMetaData} -*/ + It can be used to get a pointer to a QMediaPlayer object in order to intergrate with C++ code. -/*! - \qmlproperty variant QtMultimedia::Audio::metaData.subTitle + \code + QObject *qmlAudio; // The QML Audio object + QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlAudio->property("mediaObject")); + \endcode - This property holds the sub-title of the media. - - \sa {QMediaMetaData} + \note This property is not accessible from QML. */ /*! @@ -1470,19 +1469,18 @@ void QDeclarativeAudio::_q_statusChanged() */ /*! - \qmlproperty variant QtMultimedia::MediaPlayer::metaData.title + \qmlproperty variant QtMultimedia::MediaPlayer::mediaObject - This property holds the title of the media. + This property holds the native media object. - \sa {QMediaMetaData} -*/ + It can be used to get a pointer to a QMediaPlayer object in order to intergrate with C++ code. -/*! - \qmlproperty variant QtMultimedia::MediaPlayer::metaData.subTitle + \code + QObject *qmlMediaPlayer; // The QML MediaPlayer object + QMediaPlayer *player = qvariant_cast<QMediaPlayer *>(qmlMediaPlayer->property("mediaObject")); + \endcode - This property holds the sub-title of the media. - - \sa {QMediaMetaData} + \note This property is not accessible from QML. */ /*! |