diff -r 2b40d63a9c3d -r 90517678cc4f qtmobility/src/multimedia/qmediaresource.cpp --- a/qtmobility/src/multimedia/qmediaresource.cpp Fri Apr 16 15:51:22 2010 +0300 +++ b/qtmobility/src/multimedia/qmediaresource.cpp Mon May 03 13:18:40 2010 +0300 @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qmediaresource.h" #include #include @@ -92,7 +92,17 @@ */ QMediaResource::QMediaResource(const QUrl &url, const QString &mimeType) { - values.insert(Url, qVariantFromValue(url)); + values.insert(Url, url); + values.insert(MimeType, mimeType); +} + +/*! + Constructs a media resource with the given \a mimeType from a network \a request. +*/ +QMediaResource::QMediaResource(const QNetworkRequest &request, const QString &mimeType) +{ + values.insert(Request, QVariant::fromValue(request)); + values.insert(Url, request.url()); values.insert(MimeType, mimeType); } @@ -161,6 +171,17 @@ } /*! + Returns the network request associated with this media resource. +*/ +QNetworkRequest QMediaResource::request() const +{ + if(values.contains(Request)) + return qvariant_cast(values.value(Request)); + + return QNetworkRequest(url()); +} + +/*! Returns the MIME type of a media resource. This may be null if the MIME type is unknown.