--- a/qtmobility/src/multimedia/qmediaresource.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaresource.h Mon May 03 13:18:40 2010 +0300
@@ -44,6 +44,7 @@
#include <QtCore/qmap.h>
#include <QtCore/qmetatype.h>
+#include <QtNetwork/qnetworkrequest.h>
#include <qmobilityglobal.h>
@@ -54,6 +55,7 @@
public:
QMediaResource();
QMediaResource(const QUrl &url, const QString &mimeType = QString());
+ QMediaResource(const QNetworkRequest &request, const QString &mimeType = QString());
QMediaResource(const QMediaResource &other);
QMediaResource &operator =(const QMediaResource &other);
~QMediaResource();
@@ -64,6 +66,7 @@
bool operator !=(const QMediaResource &other) const;
QUrl url() const;
+ QNetworkRequest request() const;
QString mimeType() const;
QString language() const;
@@ -99,6 +102,7 @@
enum Property
{
Url,
+ Request,
MimeType,
Language,
AudioCodec,
@@ -108,7 +112,7 @@
VideoBitRate,
SampleRate,
ChannelCount,
- Resolution,
+ Resolution
};
QMap<int, QVariant> values;
};