Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Remove active qDebugs.
  Player demo updated with more user-friendly previous button behaviour.
  Added QNetworkRequest constructor to QMediaContent.
  Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
  Add private header warning.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/multimedia/base/qmediacontent.cpp b/src/multimedia/base/qmediacontent.cpp
index 3e32af0..fd519c6 100644
--- a/src/multimedia/base/qmediacontent.cpp
+++ b/src/multimedia/base/qmediacontent.cpp
@@ -109,6 +109,19 @@ QMediaContent::QMediaContent(const QUrl &url):
 }
 
 /*!
+    Constructs a media content with \a request providing a reference to the content.
+
+    This constructor can be used to reference media content via network protocols such as HTTP.
+    This may include additional information required to obtain the resource, such as Cookies or HTTP headers.
+*/
+
+QMediaContent::QMediaContent(const QNetworkRequest &request):
+    d(new QMediaContentPrivate)
+{
+    d->resources << QMediaResource(request);
+}
+
+/*!
     Constructs a media content with \a resource providing a reference to the content.
 */
 
diff --git a/src/multimedia/base/qmediacontent.h b/src/multimedia/base/qmediacontent.h
index 1ea4898..b6f3017 100644
--- a/src/multimedia/base/qmediacontent.h
+++ b/src/multimedia/base/qmediacontent.h
@@ -46,6 +46,7 @@
 #include <QtCore/qshareddata.h>
 
 #include <QtMultimedia/qmediaresource.h>
+#include <QtNetwork/qnetworkrequest.h>
 
 
 QT_BEGIN_HEADER
@@ -60,6 +61,7 @@ class Q_MULTIMEDIA_EXPORT QMediaContent
 public:
     QMediaContent();
     QMediaContent(const QUrl &contentUrl);
+    QMediaContent(const QNetworkRequest &contentRequest);
     QMediaContent(const QMediaResource &contentResource);
     QMediaContent(const QMediaResourceList &resources);
     QMediaContent(const QMediaContent &other);