diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-01 05:05:24 (GMT) |
| commit | e8b2404e04ff38511a96ae2dfb2aa097c6ec8166 (patch) | |
| tree | 91f59051e690551cb89df3d0304bb714c711b2f0 /src/multimedia/base/qmediacontent.cpp | |
| parent | 8095b3074a47ff317cafdce5e8a8f955bf8c97fa (diff) | |
| parent | 20def6f5fe3e02bda1c5f5873ed1923d36511312 (diff) | |
| download | Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.zip Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.gz Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
Diffstat (limited to 'src/multimedia/base/qmediacontent.cpp')
| -rw-r--r-- | src/multimedia/base/qmediacontent.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp index fd519c6..b6bf56b 100644 --- a/src/multimedia/base/qmediacontent.cpp +++ b/src/multimedia/base/qmediacontent.cpp @@ -76,6 +76,7 @@ private: \class QMediaContent \preliminary \brief The QMediaContent class provides access to the resources relating to a media content. + \since 4.7 \ingroup multimedia @@ -206,6 +207,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. */ |