Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	.qmake.conf

Change-Id: Ic08bde3ab22956734335cf342445bcc47cc60777

2 files changed, 79 insertions, 0 deletions

diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5
new file mode 100644
index 000000000..0b8bc2ee3
--- /dev/null
+++ b/dist/changes-5.9.5
@@ -0,0 +1,45 @@
+Qt 5.9.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+*                            Qt 5.9.5 Changes                              *
+****************************************************************************
+
+QtMultimedia
+------------
+
+- [QTBUG-62155] Improved rendering of YUVY and UYVY texture frames.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Linux
+-----
+
+- [QTBUG-66196] Fixed regression in Camera that caused GST_STATE_PLAYER to
+  never be set.
+- Fixed udpsrc timeout setting in gstreamer, as the unit changed from mirco-
+  to nanoseconds in gstreamer 1.0.
+
+macOS / iOS
+-----------
+
+- [QTBUG-49558] Fixed duration reporting when playing HTTP content.
diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6
new file mode 100644
index 000000000..1b8654947
--- /dev/null
+++ b/dist/changes-5.9.6
@@ -0,0 +1,34 @@
+Qt 5.9.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0 through 5.9.5.
+
+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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+*                              Qt 5.9.6 Changes                            *
+****************************************************************************
+
+ - This release contains only minor code improvements.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+WinRT
+-----
+
+- [QTBUG-63016] Avoided crash when QImage is being destroyed within capturing.
+- [QTBUG-63014] Fixed rotation of camera image.