diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-13 10:03:12 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-13 10:03:12 +0200 |
commit | d3a53b2c596367e055914383b9a3ddf330ccb3ae (patch) | |
tree | a808bd6ee9a827de7ff488e0bd9f45ef5f6bc74b | |
parent | 25abbfda9e9282305170af3188497894e6f32945 (diff) | |
parent | cc526afe9c2cdd4502c90b8f9b505812c984ea08 (diff) |
Merge remote-tracking branch 'origin/5.9.6' into 5.9
Change-Id: I6b447f47ab9becf96a0c12577e7b8ed69648b8a8
-rw-r--r-- | dist/changes-5.9.6 | 49 | ||||
m--------- | src/3rdparty | 0 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginedownloads/BLACKLIST | 4 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginepage/BLACKLIST | 1 |
4 files changed, 54 insertions, 0 deletions
diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6 new file mode 100644 index 000000000..cc656ac92 --- /dev/null +++ b/dist/changes-5.9.6 @@ -0,0 +1,49 @@ +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 * +**************************************************************************** + +Chromium +-------- + + - Security fixes from Chromium up to version 66.0.3359.170: + * CVE-2018-6120 + * CVE-2018-6115 + * CVE-2018-6114 + * CVE-2018-6118 + * CVE-2018-6103 + * CVE-2018-6101 + * CVE-2018-6101 + * CVE-2018-6085 + * CVE-2018-6086 + * CVE-2018-6088 + * CVE-2018-6090 + * Security Bug 831984 + * Security Bug 816768 + * Security Bug 797298 + +General +------- + + - [QTBUG-64071] Only add the first found widevine CDM + - [QTBUG-64925] Fix compilation with system ICU 60 + - [QTBUG-66560] Remove NOTREACHED in ScreenWin::GetNativeWindowFromHWND + - Fix build with GCC 8.1.0 diff --git a/src/3rdparty b/src/3rdparty -Subproject a684d354b010fdbc67dad89ff43ff53b20ab801 +Subproject e5175271484644d6101ff3901aaabf2bceb06f2 diff --git a/tests/auto/widgets/qwebenginedownloads/BLACKLIST b/tests/auto/widgets/qwebenginedownloads/BLACKLIST new file mode 100644 index 000000000..f8a97e9e8 --- /dev/null +++ b/tests/auto/widgets/qwebenginedownloads/BLACKLIST @@ -0,0 +1,4 @@ +[downloadLink] +* +[downloadTwoLinks] +* diff --git a/tests/auto/widgets/qwebenginepage/BLACKLIST b/tests/auto/widgets/qwebenginepage/BLACKLIST index b376cd375..a57cf0767 100644 --- a/tests/auto/widgets/qwebenginepage/BLACKLIST +++ b/tests/auto/widgets/qwebenginepage/BLACKLIST @@ -10,5 +10,6 @@ osx [getUserMediaRequest] * [mouseMovementProperties] +windows osx-10.11 osx-10.12 |