diff options
author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-17 14:34:29 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 05:37:51 +0100 |
commit | f050d8fe2ba6b23654e7df6d51e052ec588b00a3 (patch) | |
tree | 14f8d4c0360c0e943460724de06aeecce0715c53 /src/imports | |
parent | 39e6da8f8ea81e3b7c5ba47e9e3cc92ee2051925 (diff) | |
download | qtmultimedia-f050d8fe2ba6b23654e7df6d51e052ec588b00a3.tar.gz |
Use US spelling for organization.
Since it seems it was never implemented, don't keep the
legacy spelling.
Change-Id: Idc918548a4ed643ba7da35e97ce08f401e74303f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/multimedia/qdeclarativeaudio.cpp | 6 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativemediametadata_p.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index 04085edfc..a09c342b2 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -479,12 +479,12 @@ void QDeclarativeAudio::componentComplete() */ /*! - \qmlproperty variant Audio::metaData.ratingOrganisation + \qmlproperty variant Audio::metaData.ratingOrganization - This property holds the name of the rating organisation responsible for the + This property holds the name of the rating organization responsible for the parental rating of the media. - \sa {QtMultimedia::RatingOrganisation} + \sa {QtMultimedia::RatingOrganization} */ /*! diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h index c082c11e5..c67507472 100644 --- a/src/imports/multimedia/qdeclarativemediametadata_p.h +++ b/src/imports/multimedia/qdeclarativemediametadata_p.h @@ -79,7 +79,7 @@ class QDeclarativeMediaMetaData : public QObject Q_PROPERTY(QVariant publisher READ publisher NOTIFY metaDataChanged) Q_PROPERTY(QVariant copyright READ copyright NOTIFY metaDataChanged) Q_PROPERTY(QVariant parentalRating READ parentalRating NOTIFY metaDataChanged) - Q_PROPERTY(QVariant ratingOrganisation READ ratingOrganisation NOTIFY metaDataChanged) + Q_PROPERTY(QVariant ratingOrganization READ ratingOrganization NOTIFY metaDataChanged) Q_PROPERTY(QVariant size READ size NOTIFY metaDataChanged) Q_PROPERTY(QVariant mediaType READ mediaType NOTIFY metaDataChanged) Q_PROPERTY(QVariant duration READ duration NOTIFY metaDataChanged) @@ -132,8 +132,8 @@ public: QVariant publisher() const { return m_control->metaData(QtMultimedia::Publisher); } QVariant copyright() const { return m_control->metaData(QtMultimedia::Copyright); } QVariant parentalRating() const { return m_control->metaData(QtMultimedia::ParentalRating); } - QVariant ratingOrganisation() const { - return m_control->metaData(QtMultimedia::RatingOrganisation); } + QVariant ratingOrganization() const { + return m_control->metaData(QtMultimedia::RatingOrganization); } QVariant size() const { return m_control->metaData(QtMultimedia::Size); } QVariant mediaType() const { return m_control->metaData(QtMultimedia::MediaType); } QVariant duration() const { return m_control->metaData(QtMultimedia::Duration); } |