Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19

src/imports/multimedia/qdeclarativemultimediaglobal_p.h

@@ -46,12 +46,32 @@
 //
 
 #include <QtQml/qqml.h>
+#include <QtQml/qjsvalue.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace QDeclarativeMultimedia {
-    QJSValue initGlobalObject(QQmlEngine *, QJSEngine *);
-}
+class QDeclarativeMultimediaGlobal : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QJSValue defaultCamera READ defaultCamera NOTIFY defaultCameraChanged)
+    Q_PROPERTY(QJSValue availableCameras READ availableCameras NOTIFY availableCamerasChanged)
+
+public:
+    explicit QDeclarativeMultimediaGlobal(QJSEngine *engine, QObject *parent = 0);
+
+    QJSValue defaultCamera() const;
+    QJSValue availableCameras() const;
+
+Q_SIGNALS:
+    // Unused at the moment. QCameraInfo doesn't notify when cameras are added or removed,
+    // but it might change in the future.
+    void defaultCameraChanged();
+    void availableCamerasChanged();
+
+private:
+    QJSEngine *m_engine;
+};
 
 QT_END_NAMESPACE