diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 05:45:21 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-02-25 05:45:21 (GMT) |
| commit | f3abaf5ee7cdef1c963df383885668abd55427c3 (patch) | |
| tree | 57e68d2bc2445f56534fa04dc4ad411db8da5b3e /src/multimedia | |
| parent | 77f722aca2c5243f07733dcb302035fb3c454f3a (diff) | |
| parent | f4d15309c2c44bb2fdc18a8c89629c6f415f0b67 (diff) | |
| download | Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.zip Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.tar.gz Qt-f3abaf5ee7cdef1c963df383885668abd55427c3.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qmediacontent.cpp | 9 | ||||
| -rw-r--r-- | src/multimedia/base/qmediacontent.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp index fd519c6..dd0c315 100644 --- a/src/multimedia/base/qmediacontent.cpp +++ b/src/multimedia/base/qmediacontent.cpp @@ -206,6 +206,15 @@ QUrl QMediaContent::canonicalUrl() const } /*! + Returns a QNetworkRequest that represents that canonical resource for this media content. +*/ + +QNetworkRequest QMediaContent::canonicalRequest() const +{ + return canonicalResource().request(); +} + +/*! Returns a QMediaResource that represents that canonical resource for this media content. */ diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/base/qmediacontent.h index b6f3017..5a279c1 100644 --- a/src/multimedia/base/qmediacontent.h +++ b/src/multimedia/base/qmediacontent.h @@ -75,6 +75,7 @@ public: bool isNull() const; QUrl canonicalUrl() const; + QNetworkRequest canonicalRequest() const; QMediaResource canonicalResource() const; QMediaResourceList resources() const; |