diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:14:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-19 17:15:56 +0100 |
| commit | d396262bc9771cacbc71e79215768984fa1974ff (patch) | |
| tree | e029399524feabed6ebe0ee1e010af9f5e58932d /src/plugins/blackberry/mediaplayer/bbmetadata.h | |
| parent | 0ce2cb3ebe6289e3db14438560fa186d9e5186b8 (diff) | |
| parent | 2db2cde0d8433ad1aed59412717c4cddf496ba66 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
Diffstat (limited to 'src/plugins/blackberry/mediaplayer/bbmetadata.h')
| -rw-r--r-- | src/plugins/blackberry/mediaplayer/bbmetadata.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/blackberry/mediaplayer/bbmetadata.h b/src/plugins/blackberry/mediaplayer/bbmetadata.h index 3bb323a4d..f4b742296 100644 --- a/src/plugins/blackberry/mediaplayer/bbmetadata.h +++ b/src/plugins/blackberry/mediaplayer/bbmetadata.h @@ -61,6 +61,7 @@ public: int width() const; bool hasVideo() const; bool hasAudio() const; + bool isSeekable() const; QString title() const; QString artist() const; @@ -81,7 +82,7 @@ private: int m_mediaType; float m_pixelWidth; float m_pixelHeight; - + bool m_seekable; QString m_title; QString m_artist; QString m_comment; |