Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Add meta-data keys for embedded images.

2 files changed, 10 insertions, 1 deletions

diff --git a/src/multimedia/base/qtmedianamespace.h b/src/multimedia/base/qtmedianamespace.h
index fe20a05..1e04da8 100644
--- a/src/multimedia/base/qtmedianamespace.h
+++ b/src/multimedia/base/qtmedianamespace.h
@@ -144,7 +144,12 @@ namespace QtMultimedia
         Contrast,
         Saturation,
         Sharpness,
-        DeviceSettingDescription
+        DeviceSettingDescription,
+
+        PosterImage,
+        CoverArtImage,
+        ThumbnailImage
+
     };
 
     enum SupportEstimate
diff --git a/src/multimedia/base/qtmedianamespace.qdoc b/src/multimedia/base/qtmedianamespace.qdoc
index 58e9c92..277b1a5 100644
--- a/src/multimedia/base/qtmedianamespace.qdoc
+++ b/src/multimedia/base/qtmedianamespace.qdoc
@@ -98,6 +98,7 @@
 
     \value CoverArtUrlSmall The URL of a small cover art image. QUrl.
     \value CoverArtUrlLarge The URL of a large cover art image. QUrl.
+    \value CoverArtImage An embedded cover art image. QImage.
 
     Image and video attributes
     \value Resolution The dimensions of an image or video.  QSize.
@@ -109,6 +110,7 @@
     \value VideoCodec The codec of the media's video stream.  QString.
 
     \value PosterUrl The URL of a poster image.  QUrl.
+    \value PosterImage An embedded poster image.  QImage.
 
     Movie attributes
     \value ChapterNumber The chapter number of the media.  int.
@@ -162,6 +164,8 @@
         Indicates the direction of sharpness processing applied by the camera when the image was shot.
     \value DeviceSettingDescription
         Exif tag, indicates information on the picture-taking conditions of a particular camera model. QString
+
+    \value ThumbnailImage An embedded thumbnail image.  QImage.
 */
 
 /*!