Merge remote-tracking branch 'origin/5.7.0' into 5.7

Change-Id: I33bc33f979003302b66a57f34a4d64fcb8986d7d

3 files changed, 140 insertions, 6 deletions

diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1
new file mode 100644
index 000000000..df0e3c1ad
--- /dev/null
+++ b/dist/changes-5.6.1
@@ -0,0 +1,64 @@
+Qt 5.6.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  https://doc.qt.io/qt-5.6
+
+The Qt version 5.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - [QTBUG-51911] fixed camera frames appearing flipped for a brief moment
+   when starting or stopping a video recording.
+
+iOS / OS X
+----------
+
+ - Fixed the camera resolution incorrectly being changed when switching
+   to image capture mode.
+
+Linux
+-----
+
+ - PulseAudio: fixed playback of short streams never starting with
+   QAudioOutput in pull mode.
+ - [QTBUG-40823][QTBUG-49461] changing the volume of a QAudioOutput or
+   QAudioInput doesn't affect the system volume anymore.
+ - [QTBUG-51607] fixed camera not working when QT_NO_GLIB is set.
+
+QNX
+---
+
+ - Fixed video playback in VMWare.
+
+Windows
+-------
+
+ - The DirectShow backend is now available on Windows CE.
+ - [QTBUG-49281] fixed a memory leak when stopping the camera.
+ - [QTBUG-53114] QMediaPlayer can now load UNC paths.
+
+WinRT
+-----
+
+ - [QTBUG-38802] the manifest now automatically includes permissions for
+   microphone and camera when a project contains QT += multimedia.
+ - [QTBUG-47803] fixed camera image capture signals not being emitted when
+   the first capture is done.
diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0
new file mode 100644
index 000000000..dfa2785e4
--- /dev/null
+++ b/dist/changes-5.7.0
@@ -0,0 +1,67 @@
+Qt 5.7 introduces many new features and improvements as well as bugfixes
+over the 5.6.x series. Also, there is a change in the licensing terms.
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Important License Changes                       *
+****************************************************************************
+
+  This module is no longer available under LGPLv2.1. The libraries are
+  now available under the following licenses:
+    * Commercial License
+    * GNU General Public License v2.0 (LICENSE.GPL2) and later
+    * GNU Lesser General Public License v3.0 (LICENSE.LGPL3)
+
+  The tools are now available under the following licenses:
+    * Commercial License
+    * GNU General Public License 3.0 (LICENSE.GPL3) with exceptions
+      described in The Qt Company GPL Exception 1.0 (LICENSE.GPL3-EXCEPT)
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtMultimedia
+------------
+
+ - Playlist (QML):
+   * Added new addItems(), insertItems(), moveItem() and removeItems()
+     methods.
+
+ - CameraImageProcessing (QML):
+   * Added new brightness property.
+
+ - QCameraImageProcessing:
+   * Added new brightness property.
+
+ - QPlaylist:
+   * Added new moveMedia() function.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+tvOS
+----
+
+ - Added support for media player and camera APIs.
+
+WinRT
+-----
+
+ - [QTBUG-42287] Added support for QAudioDeviceInfo, QAudioInput,
+   QAudioOutput, and QSoundEffect.
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index a4584487a..856549438 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -101,7 +101,13 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
         ComPtr<IMediaEncodingProperties> properties;
         hr = (*propertiesList)->GetAt(index, &properties);
         Q_ASSERT_SUCCEEDED(hr);
-        if (type == MediaStreamType_VideoRecord || type == MediaStreamType_VideoPreview) {
+        HString propertyType;
+        hr = properties->get_Type(propertyType.GetAddressOf());
+        Q_ASSERT_SUCCEEDED(hr);
+
+        const HStringReference videoRef = HString::MakeReference(L"Video");
+        const HStringReference imageRef = HString::MakeReference(L"Image");
+        if (propertyType == videoRef) {
             ComPtr<IVideoEncodingProperties> videoProperties;
             hr = properties.As(&videoProperties);
             Q_ASSERT_SUCCEEDED(hr);
@@ -111,13 +117,10 @@ HRESULT getMediaStreamResolutions(IMediaDeviceController *device,
             hr = videoProperties->get_Height(&height);
             Q_ASSERT_SUCCEEDED(hr);
             resolutions->append(QSize(width, height));
-        } else if (type == MediaStreamType_Photo) {
+        } else if (propertyType == imageRef) {
             ComPtr<IImageEncodingProperties> imageProperties;
             hr = properties.As(&imageProperties);
-            // Asking for Photo also returns video resolutions in addition
-            // We skip those, as we are only interested in image Type
-            if (FAILED(hr) || !imageProperties)
-                continue;
+            Q_ASSERT_SUCCEEDED(hr);
             UINT32 width, height;
             hr = imageProperties->get_Width(&width);
             Q_ASSERT_SUCCEEDED(hr);