From 15b7a43417e6ae2a3922010524881405ef6b7474 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 6 Sep 2019 11:18:20 +0200
Subject: [PATCH 01/46] Fix WebEngineView flashing when closing popup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closing a popup (eg. HTML select element) might cause WebEngineView to
flash on macOS. This seems to be related to the window's NSPanel
destruction and seems to appear only if the Qt::ToolTip window flag is
set.

Fixes: QTBUG-77072
Fixes: QTBUG-78084
Change-Id: I72af67ee97304278870b312482f8f9058ecd1233
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
(cherry picked from commit 2f72083601fb6a4fcc66b6440222291fc334cb3f)
---
 .../render_widget_host_view_qt_delegate_quickwindow.cpp         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
index d3c88148eab..7db223ad9a8 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
@@ -47,7 +47,7 @@ namespace QtWebEngineCore {
 RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate)
     : m_realDelegate(realDelegate)
 {
-    setFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
+    setFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
 }
 
 RenderWidgetHostViewQtDelegateQuickWindow::~RenderWidgetHostViewQtDelegateQuickWindow()

From 75d121b9e07bbaf3eeea44da776a45c03bb6af47 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Wed, 30 Oct 2019 13:22:17 +0100
Subject: [PATCH 02/46] Bump version

---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 65f02f1b4eb..5310dd04e35 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.12.5
+MODULE_VERSION = 5.12.6

From ce515c418871b24b6f38878c560c360414a936a9 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 29 Oct 2019 13:32:23 +0100
Subject: [PATCH 03/46] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
4055f1498d Fix building with pulseaudio 13
b0fb9f38d9f [Backport] Fix security issue 957160
70036bae331 [Backport] Fix CVE-2019-5869
e6902ac08d4 Add missing semicolon to fix build with icu 65.1
55e2f9a305c [Backport] CVE-2019-5870
a0d7bfaee7d [Backport] CVE-2019-13659
4e154694fbc [Backport] CVE-2019-13660
cdee285b9b2 [Backport] CVE-2019-5875
bf4fb03c7c4 Fix building with VS2019
5ab4355f5e9 [Backport] CVE-2019-5876
5f1b74a907d [Backport] CVE-2019-13687
d4780d1a68b [Backport] CVE-2019-13688

Change-Id: I418e5b0ddb3a0e482330ac5560a2383d5d389b6d
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 111349f18a4..d4780d1a68b 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 111349f18a4d352d40c1c106a6f8e98a9f843894
+Subproject commit d4780d1a68bf370514fb5fe6f8bf01104f764e38

From e0c11f482184e4278f30eabaa2ad8593cb53bfd5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 31 Oct 2019 11:16:38 +0100
Subject: [PATCH 04/46] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
c0ad7bb1842 [Backport] CVE-2019-13691
3dbf3a4c21f [Backport] CVE-2019-13692
3d89c990655 [Backport] CVE-2019-13693
cda3a507f68 [Backport] CVE-2019-13694
a6fbcf5a98d [Backport] CVE-2019-13695
635b163527b [Backport] CVE-2019-13697
fcb382834f9 [Backport] Security issue 986727 [1/2]
593acfce0ca [Backport] Security issue 986727 [2/2]

Change-Id: I275b9d3031bfbea8796507dd1669e772be446fe2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index d4780d1a68b..217ab69596f 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit d4780d1a68bf370514fb5fe6f8bf01104f764e38
+Subproject commit 217ab69596fd1ca51af2d8e6292b579f86f13f25

From f6ff5b17edfcd72c1536b46d8db1c9a30f70a6ba Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 1 Nov 2019 14:26:07 +0100
Subject: [PATCH 05/46] Update Chromium

Pulls in remaining security patches from 77 and one from 78 under
active attack.

Changes:
4fb070d2eb3 [Backport] Fix for CVE-2019-13720
9f720e99462 [Backport] CVE-2019-13664
96cdfdfc635 [Backport] CVE-2019-13665
8a7e8fca86d [Backport] Security issue 946351
bf49c9261e8 [Backport] Security issue 964938
af3f9345ac4 [Backport] Security issue 990234
24a674a2ce8 [Backport] CVE-2019-13674
50dda9e6fda [Backport] CVE-2019-13675
e8fcf3a6a28 [Backport] Security issue 960354
db783cf5684 [Backport] Security issue 979373
89644ad92fe [Backport] Security issue 981459

Task-number: QTBUG-79193
Change-Id: I6ad20783c27cc3c4464923d6b0b7a629ebe51840
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 217ab69596f..89644ad92fe 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 217ab69596fd1ca51af2d8e6292b579f86f13f25
+Subproject commit 89644ad92fee38706430c1adb1e29b9756193b4f

From 14e2814f95cbb1759100a2b974bc61ef39dfb9c2 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@qt.io>
Date: Thu, 7 Nov 2019 13:08:02 +0100
Subject: [PATCH 06/46] Bump version

---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 5310dd04e35..2058bb5d6f6 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.12.6
+MODULE_VERSION = 5.12.7

From 636b32c7f22c96e9562270219cedca52d5203737 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 7 Nov 2019 10:56:07 +0100
Subject: [PATCH 07/46] Add changes file for Qt 5.12.6

Change-Id: Ib5f32dff2db201bc85f714b50937bad9093a92c6
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.6 | 64 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 dist/changes-5.12.6

diff --git a/dist/changes-5.12.6 b/dist/changes-5.12.6
new file mode 100644
index 00000000000..386eac2338d
--- /dev/null
+++ b/dist/changes-5.12.6
@@ -0,0 +1,64 @@
+Qt 5.12.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.5.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.12.6 Changes                           *
+****************************************************************************
+
+General
+-------
+
+  - [QTBUG-77072,QTBUG-78084] Fixed flashing when closing popup on macOS.
+  - [QTBUG-78733] Fixed building with Visual Studio 2019.
+  - [QTBUG-77037] Fixed building with Pulseaudio 13.
+  - Fixed building with system ICU 65.
+
+Chromium
+--------
+
+ - Security fixes from Chromium up to version 77.0.3865.120, including:
+
+    - CVE-2019-5869
+    - CVE-2019-5870
+    - CVE-2019-5875
+    - CVE-2019-5876
+    - CVE-2019-13659
+    - CVE-2019-13660
+    - CVE-2019-13664
+    - CVE-2019-13665
+    - CVE-2019-13674
+    - CVE-2019-13675
+    - CVE-2019-13687
+    - CVE-2019-13688
+    - CVE-2019-13691
+    - CVE-2019-13692
+    - CVE-2019-13693
+    - CVE-2019-13694
+    - CVE-2019-13695
+    - CVE-2019-13697
+    - Security issue 946351
+    - Security issue 957160
+    - Security issue 960354
+    - Security issue 964938
+    - Security issue 979373
+    - Security issue 981459
+    - Security issue 986727
+    - Security issue 990234
+
+ - Security fix from Chrome 78: CVE-2019-13720.

From 5f05d9d1a3e0f30d4e7cccfe2d70387437fcccf3 Mon Sep 17 00:00:00 2001
From: Tamas Zakor <ztamas@inf.u-szeged.hu>
Date: Mon, 4 Nov 2019 16:32:23 +0100
Subject: [PATCH 08/46] Fix pepper flash plugin permission

Fixes: QTBUG-78280
Fixes: QTBUG-80696
Change-Id: Ic202314bb7935741791fa8c747e255b10dc7dc61
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org>
(cherry picked from commit e72fd5136c5a7a848d9156334cf8f067eb1a1a10)
---
 src/core/content_client_qt.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index df1bc303de2..61194bae080 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -125,7 +125,8 @@ static QString getLocalAppDataDir()
 static const int32_t kPepperFlashPermissions = ppapi::PERMISSION_DEV |
                                                ppapi::PERMISSION_PRIVATE |
                                                ppapi::PERMISSION_BYPASS_USER_GESTURE |
-                                               ppapi::PERMISSION_FLASH;
+                                               ppapi::PERMISSION_FLASH |
+                                               ppapi::PERMISSION_SOCKET;
 
 namespace switches {
 const char kPpapiFlashPath[]    = "ppapi-flash-path";

From 8b6f4924a1a8564987a9f0110060cc9b3a2d89bf Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 19 Dec 2019 15:09:34 +0100
Subject: [PATCH 09/46] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pulls in following changes:

* d88a4a62100  [Backport] CVE-2019-13700
* d835d057c27  [Backport] CVE-2019-13701
* 9e816ff0eb4  Fix compiling on Xcode 11.
* 7d0edd2bed2  Fix use of deprecated method for scanning wifi networks
* 5be6616bfe2  [Backport] CVE-2019-15903
* 63902dffe13  [Backport] CVE-2019-13714
* c8ec40bb38c  [Backport] CVE-2019-13715
* 61ba046fc61  [Backport] CVE-2019-13718
* 300c4402c06  [Backport] Security bug 1011551
* e0369af7ae7  [Backport] Secuirty bug 1006544
* c9d697a2959  [Backport] Security bug 993266
* a7a50a7adf3  [Backport] Security bug 1018406
* 246773b5a07  [Backport] Security bug 955191
* fc95242615b  Revert "[Backport] CVE-2019-13701"

Change-Id: I4ac3fe4acecc1d1193ecbf5c7966e8aad43cb68a
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 89644ad92fe..fc95242615b 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 89644ad92fee38706430c1adb1e29b9756193b4f
+Subproject commit fc95242615b5b2abdcd06f806e6d1ecfca770ca5

From 7d82dafa46a356b80c8e55fda7e57f28ff1bc423 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Wed, 8 Jan 2020 11:05:22 +0100
Subject: [PATCH 10/46] Fixup Update Chromium

Wrong hash:

* fc95242615b -> 0bf0431f9fe Revert "[Backport] CVE-2019-13701"

Change-Id: I05e2e6511df628c79d2d13e8c00139d53774134e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index fc95242615b..0bf0431f9fe 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit fc95242615b5b2abdcd06f806e6d1ecfca770ca5
+Subproject commit 0bf0431f9fea75fdad4ab519788ca807fd86e3c7

From 5fa161b5f273ec60e77bbdcfdd0f87dd42a5a0bc Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 21 Jan 2020 16:48:11 +0100
Subject: [PATCH 11/46] Update Chromium

Pulls in following patches:

* 42b5c26a6af  [Backport] Avoid leaking GamepadService in tests
* c7196fc6a85  [Backport] Security bug 1017020
* 8fafaa17b3b  [Backport] Security bug 1017961
* 9d6e9a7ca2d  [Backport] CVE-2019-13736
* f11302cbaab  [Backport] CVE-2019-13737
* 990546181b6  [Backport] Fix for CVE-2019-13730: Type Confusion in V8
* f33ba482f60  [Backport] Fix for CVE-2019-13732: Use after free in WebAudio
* f0f6703e7d3  [Backport] Fix for CVE-2019-13764: Type Confusion in V8
* 67232758405  [Backport] Dependency for fixing CVE-2019-13734 (1/5)
* 520f5e48c7b  [Backport] Dependency for fixing CVE-2019-13734 (2/5)
* b4b8e7c5a3c  [Backport] Dependency for fixing CVE-2019-13734 (3/5)
* 17bda0b1daf  [Backport] Dependency for fixing CVE-2019-13734 (4/5)
* 437d404bd6d  [Backport] Dependency for fixing CVE-2019-13734 (5/5)
* bcba12fa82a  [Backport] CVE-2019-13741: Insufficient validation of untrusted input in Blink
* b07274b9d31  [Backport] CVE-2019-13762: Insufficient policy enforcement in downloads.
* c445a9bcf07  [Backport] CVE-2019-13734: Out of bounds write in SQLite
* 0dde1aba1cd  [Backport] Fix up for dependency for CVE-2019-13734 (3/5)

Task-number: QTBUG-80736
Change-Id: I53af6ffbe3975c8ab601eabba79c31acaf434482
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 0bf0431f9fe..0dde1aba1cd 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 0bf0431f9fea75fdad4ab519788ca807fd86e3c7
+Subproject commit 0dde1aba1cdfa3034176b47ef778cc99791843e7

From d268d9bba5589b7cc33e158b8563eae2ad67caff Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 22 Jan 2020 19:04:52 +0100
Subject: [PATCH 12/46] Update Chromium

Pulls in following patches:

* 1d84b1d66de  [Backport] CVE-2020-6377
* a0a756490e5  [Backport] CVE-2019-13761: Incorrect security UI in Omnibox.
* 1735d7de2e2  [Backport] Security bug 1027905
* 20d31c84457  [Backport] CVE-2019-13747: Uninitialized Use in rendering.
* b154c1e99b3  [Backport] Security bug 1025089
* 95f69c52f85  [Backport] CVE-2019-13757: Incorrect security UI in Omnibox (1/2)
* 0026972c101  [Backport] CVE-2019-13757: Incorrect security UI in Omnibox (2/2)
* f527b66b1e3  [Backport] Security bug 889276
* 37330fd70ee  [Backport] Security bug 1033260

Task-number: QTBUG-80736
Change-Id: Ie98271999713f07e4c2fab86df28e86310e1a44b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 0dde1aba1cd..37330fd70ee 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 0dde1aba1cdfa3034176b47ef778cc99791843e7
+Subproject commit 37330fd70ee942d1ed55ab6bb4fbfd1d4c6f82e9

From 13fd53ae994ada3fca89c0d39b17df5395b712bf Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 24 Jan 2020 19:16:13 +0100
Subject: [PATCH 13/46] Update Chromium

Pulls in following patches:

* 28d34c9574b  [Backport] CVE-2019-13738
* b94dccc951a  [Backport] CVE-2019-13739
* f2ad81650e5  [Backport] CVE-2019-13735: Out of bounds write in V8
* 502cf4dc5a4  [Backport] Dependency of fix for CVE-2019-13758 (1/3)
* f59df0d5773  [Backport] Dependency of fix for CVE-2019-13758 (2/3)
* aedfb4f4114  [Backport] Dependency of fix for CVE-2019-13758 (3/3)
* e3130b222f6  [Backport] CVE-2019-13758: Insufficient policy
enforcement in navigation.
* a3c60650eae  [Backport] CVE-2019-13728: Out of bounds write in V8

Task-number: QTBUG-80736
Change-Id: Id00bb34174b6f8313e6512bfd5f5928f6413a142
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 37330fd70ee..a3c60650eae 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 37330fd70ee942d1ed55ab6bb4fbfd1d4c6f82e9
+Subproject commit a3c60650eae7a568e1e32b62ba3f7f51946f2ebd

From 85e542f9376fd9bc8430c34b86ac05d13ed8d3f8 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 24 Jan 2020 19:57:35 +0100
Subject: [PATCH 14/46] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pulls in following patches:

* f4f2d564d94  [Backport] CVE-2020-0601
* f91f6b41907  [Backport] Security bug 1035371 and 1034695
* 5ca6ac0f951  [Backport] Security bugs 1029506, 1029210, 1029027,
1029002, 1028722

Task-number: QTBUG-80736
Change-Id: I2680d5a4d9af95b0ee1e8b27f98749332250b04c
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index a3c60650eae..5ca6ac0f951 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit a3c60650eae7a568e1e32b62ba3f7f51946f2ebd
+Subproject commit 5ca6ac0f951adec1f816b42f1c862d699e56a645

From 41cef6e19364d785bd77c42e45ef7ca32e601410 Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Thu, 16 Jan 2020 15:22:27 +0200
Subject: [PATCH 15/46] Add changes file for Qt 5.12.7

+ 14e2814f95cbb1759100a2b974bc61ef39dfb9c2 Bump version
+ 5f05d9d1a3e0f30d4e7cccfe2d70387437fcccf3 Fix pepper flash plugin permission
+ 8b6f4924a1a8564987a9f0110060cc9b3a2d89bf Update Chromium
+ 7d82dafa46a356b80c8e55fda7e57f28ff1bc423 Fixup Update Chromium
+ a4b598d1633e8278776c922faae012681018cdc9 Merge remote-tracking branch 'origin/5.12.6' into 5.12
+ 5fa161b5f273ec60e77bbdcfdd0f87dd42a5a0bc Update Chromium
+ d268d9bba5589b7cc33e158b8563eae2ad67caff Update Chromium
+ 13fd53ae994ada3fca89c0d39b17df5395b712bf Update Chromium
+ 85e542f9376fd9bc8430c34b86ac05d13ed8d3f8 Update Chromium

Change-Id: Iffa4dbd79f9bc3777c2f1a70519b8893e99c9758
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.7 | 78 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 dist/changes-5.12.7

diff --git a/dist/changes-5.12.7 b/dist/changes-5.12.7
new file mode 100644
index 00000000000..4fdbb17d08d
--- /dev/null
+++ b/dist/changes-5.12.7
@@ -0,0 +1,78 @@
+Qt 5.12.7 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.6.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.12.7 Changes                           *
+****************************************************************************
+
+General
+-------
+
+  - [QTBUG-78280, QTBUG-80696] Fix pepper flash plugin permission
+
+Chromium
+--------
+
+  - Security fixes from Chromium up to version 79.0.3945.130, including:
+
+    - CVE-2019-13700
+    - CVE-2019-13714
+    - CVE-2019-13715
+    - CVE-2019-13718
+    - CVE-2019-13728
+    - CVE-2019-13730
+    - CVE-2019-13732
+    - CVE-2019-13734
+    - CVE-2019-13735
+    - CVE-2019-13736
+    - CVE-2019-13737
+    - CVE-2019-13738
+    - CVE-2019-13739
+    - CVE-2019-13741
+    - CVE-2019-13747
+    - CVE-2019-13750
+    - CVE-2019-13751
+    - CVE-2019-13752
+    - CVE-2019-13753
+    - CVE-2019-13757
+    - CVE-2019-13758
+    - CVE-2019-13761
+    - CVE-2019-13762
+    - CVE-2019-13764
+    - CVE-2019-15903
+    - CVE-2020-0601
+    - CVE-2020-6377
+    - Security bug 889276
+    - Security bug 955191
+    - Security bug 993266
+    - Security bug 1006544
+    - Security bug 1011551
+    - Security bug 1017020
+    - Security bug 1017961
+    - Security bug 1018406
+    - Security bug 1025089
+    - Security bug 1027905
+    - Security bug 1028722
+    - Security bug 1029002
+    - Security bug 1029027
+    - Security bug 1029210
+    - Security bug 1029506
+    - Security bug 1033260
+    - Security bug 1034695
+    - Security bug 1035371

From 13e2924f054170f399ea213cabbae2027831ceba Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 28 Jan 2020 11:58:01 +0100
Subject: [PATCH 16/46] Bump version

---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 2058bb5d6f6..075e95ecca3 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.12.7
+MODULE_VERSION = 5.12.8

From 2f56fd4a6b9b6f806334ba64b3689151a78d1d90 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 21 Jan 2020 16:32:24 +0100
Subject: [PATCH 17/46] Update navigation actions when load finishes in a
 subframe

Fixes: QTBUG-81521
Change-Id: I8ca82224cd834b667471d1e96a44430164d3669e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/web_contents_delegate_qt.cpp         |  4 +-
 .../qwebenginepage/tst_qwebenginepage.cpp     | 37 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 20de0546f5b..c840b7f43be 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -409,8 +409,10 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
         return;
     }
 
-    if (render_frame_host->GetParent())
+    if (render_frame_host->GetParent()) {
+        m_viewClient->updateNavigationActions();
         return;
+    }
 
     if (!m_faviconManager->hasCandidate())
         m_viewClient->iconChanged(QUrl());
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index f27dae3c791..080bba6434e 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1327,20 +1327,39 @@ void tst_QWebEnginePage::textEditing()
 void tst_QWebEnginePage::backActionUpdate()
 {
     QWebEngineView view;
+    view.resize(640, 480);
+    view.show();
+
     QWebEnginePage *page = view.page();
+    QSignalSpy loadSpy(page, &QWebEnginePage::loadFinished);
     QAction *action = page->action(QWebEnginePage::Back);
     QVERIFY(!action->isEnabled());
-    QSignalSpy loadSpy(page, SIGNAL(loadFinished(bool)));
-    QUrl url = QUrl("qrc:///resources/framedindex.html");
-    page->load(url);
-    QTRY_COMPARE(loadSpy.count(), 1);
+
+    page->load(QUrl("qrc:///resources/framedindex.html"));
+    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000);
     QVERIFY(!action->isEnabled());
-    QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(10, 10));
-    QEXPECT_FAIL("", "Behavior change: Load signals are emitted only for the main frame in QtWebEngine.", Continue);
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 100);
 
-    QEXPECT_FAIL("", "FIXME: Mouse events aren't passed from the QWebEngineView down to the RWHVQtDelegateWidget", Continue);
-    QVERIFY(action->isEnabled());
+    auto firstAnchorCenterInFrame = [](QWebEnginePage *page, const QString &frameName) {
+        QVariantList rectList = evaluateJavaScriptSync(page,
+            "(function(){"
+            "var frame = document.getElementsByName('" + frameName + "')[0];"
+            "var anchor = frame.contentDocument.getElementsByTagName('a')[0];"
+            "var rect = anchor.getBoundingClientRect();"
+            "return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
+        "})()").toList();
+
+        if (rectList.count() != 2) {
+            qWarning("firstAnchorCenterInFrame failed.");
+            return QPoint();
+        }
+
+        return QPoint(rectList.at(0).toInt(), rectList.at(1).toInt());
+    };
+
+    QVERIFY(evaluateJavaScriptSync(page, "document.getElementsByName('frame_b')[0].contentDocument == undefined").toBool());
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, firstAnchorCenterInFrame(page, "frame_c"));
+    QTRY_VERIFY(evaluateJavaScriptSync(page, "document.getElementsByName('frame_b')[0].contentDocument != undefined").toBool());
+    QTRY_VERIFY(action->isEnabled());
 }
 
 #if defined(QWEBENGINEPAGE_SETTINGS)

From d7a7663c58fa81b04b2acc63c3e672fce2f46116 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Mon, 10 Feb 2020 17:28:11 +0100
Subject: [PATCH 18/46] Fix crashes in urlChanged signal handlers

If a user initiates page load from a urlChanged signal handler
after a failed navigation while still being in
NavigationRequest::OnRequestFailedInternal(), the new page load can
discard the pending navigation entry and delete the NavigationRequest
instance before finishing execution of OnRequestFailedInternal().

Fix crash by returning to the event loop before emitting
urlChanged signal.

Task-number: QTBUG-78490
Change-Id: I849a609f5524d715769079f6c5cabf8db6b45944
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/webengine/api/qquickwebengineview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 8097689ade7..60aaead671a 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -356,7 +356,9 @@ void QQuickWebEngineViewPrivate::urlChanged(const QUrl &url)
 {
     Q_Q(QQuickWebEngineView);
     Q_UNUSED(url);
-    Q_EMIT q->urlChanged();
+    QTimer::singleShot(0, q, [q]() {
+        Q_EMIT q->urlChanged();
+    });
 }
 
 void QQuickWebEngineViewPrivate::iconChanged(const QUrl &url)

From 3befcb16308f3b87a8c7b2dd1db69b69e2074c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Fri, 20 Mar 2020 09:28:18 +0100
Subject: [PATCH 19/46] Update Chromium

Pulls in the following changes:

2c37da9ad4f [Backport] Allow restricted clock_nanosleep in Linux sandbox
1119bc1c945 [Backport] Security bug 1040700
7ce30813cdc [Backport] CVE-2020-6381 - Integer overflow in Javascript
50d216266c1 [Backport] CVE-2020-6418 - Type confusion in V8
f4ee4fe130c [Backport] CVE-2020-6383 - Type confusion in V8
7cfa13add28 [Backport] CVE-2020-6384: Use after free in WebAudio
a75e60afb7c [Backport] Security bug 1029865
24e36e97107 [Backport] Security bug 1044570
acb02559c02 [Backport] CVE-2020-6389 - Out of bounds write in WebRTC
807a82b2e28 [Backport] CVE-2020-6420: Insufficient policy enforcement in media
30040b36f90 [Backport] Security bug 1031909
9dfaed8eab0 [Backport] CVE-2020-6406 - Use after free in audio
ca0ca819983 [Backport] CVE-2020-6393 - Insufficient policy enforcement in Blink

Task-number: QTBUG-81910
Change-Id: Ib3c90cabf2151d652de2a4742f7b0422bf730419
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 5ca6ac0f951..ca0ca819983 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 5ca6ac0f951adec1f816b42f1c862d699e56a645
+Subproject commit ca0ca81998398fd8f777651e29b2bd414ad1b77e

From c6d4d262cb42887bcc209087ab4270407f80e738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Tue, 24 Mar 2020 09:23:10 +0100
Subject: [PATCH 20/46] Update Chromium

Pulls in the following changes:

cecd1a67e96 [Backport] CVE-2020-6394 - Insufficient policy enforcement in Blink
9a821b38b3f [Backport] CVE-2020-6398 - Uninitialized use in PDFium
3abef6fa271 [Backport] CVE-2020-6401 (1/3) and CVE-2020-6411
581ef6c8ccf [Backport] CVE-2020-6401 (2/3)
c0a826b58f7 [Backport] CVE-2020-6401 (3/3)
55b7cedcc65 [Backport] Security bug 1018629
873da842e3d [Backport] CVE-2020-6410 - Insufficient policy enforcement in navigation
dec516df711 [Backport] CVE-2020-6412 - Insufficient validation of untrusted input in Omnibox
4b2fb2f933f [Backport] CVE-2020-6413 - Inappropriate implementation in Blink
86959566c4b [Backport] Security bug 1020031
442f3b6715d [Backport] Security bug 1016506
09277a67339 [Backport] Security bug 1026293
1bdf6178d9a [Backport] Security bug 1047097
6bf234cfacc [Backport] Security bug 1025442
02e9407022a [Backport] Security bug 1016038
f7524c75783 [Backport] CVE-2020-6388 - Out of bounds memory access in WebAudio
604ef94f4f9 [Backport] CVE-2019-20503: Out of bounds read in usersctplib

Task-number: QTBUG-81910
Change-Id: I5b36f3f65852af99cc551cbad2a6da60a1007176
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index ca0ca819983..604ef94f4f9 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit ca0ca81998398fd8f777651e29b2bd414ad1b77e
+Subproject commit 604ef94f4f9e82a555109d87532bff6fb6739f41

From 09287cb18d2d41a5b18c5cf7b1e8e07183618ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Wed, 25 Mar 2020 10:42:37 +0100
Subject: [PATCH 21/46] Update Chromium

Pulls in the following changes:

1a2d6d8df67 [Backport] Dependency for CVE-2020-6391
4ceb67df8cd [Backport] CVE-2020-6391 - Insufficient validation of untrusted input in Blink (1/3)
bca907a58b5 [Backport] CVE-2020-6391 - Insufficient validation of untrusted input in Blink (2/3)
479882836f3 [Backport] CVE-2020-6391 - Insufficient validation of untrusted input in Blink (3/3)
f616cecf23c [Backport] CVE-2020-6399 - Insufficient policy enforcement in AppCache
62ca8dad9bb [Backport] Security bug 1035723
0ee1af65d4e [Backport] Fix multiple CVEs and security bugs in sqlite
7483e059d88 [Backport] CVE-2019-18197 - Multiple vulnerabilities in XML

Change-Id: I9d8992b1aa28f4fb5704b37d8493cd6964bcf4ed
Fixes: QTBUG-81910
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 604ef94f4f9..7483e059d88 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 604ef94f4f9e82a555109d87532bff6fb6739f41
+Subproject commit 7483e059d887136a989185d6056ccb79cf4ddd19

From 175b8129d1b0e6d9372de8ce9e1b45ab49fef336 Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Mon, 16 Mar 2020 13:57:44 +0200
Subject: [PATCH 22/46] Add changes file for Qt 5.12.8

+ 13e2924f054170f399ea213cabbae2027831ceba Bump version
+ 2f56fd4a6b9b6f806334ba64b3689151a78d1d90 Update navigation actions when load finishes in a subframe
+ d7a7663c58fa81b04b2acc63c3e672fce2f46116 Fix crashes in urlChanged signal handlers
+ 3befcb16308f3b87a8c7b2dd1db69b69e2074c12 Update Chromium
+ c6d4d262cb42887bcc209087ab4270407f80e738 Update Chromium
+ 09287cb18d2d41a5b18c5cf7b1e8e07183618ff2 Update Chromium

Change-Id: I5dd5ae4c57aacea4717e36d77e84cac12cd2a3e8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.8 | 73 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 dist/changes-5.12.8

diff --git a/dist/changes-5.12.8 b/dist/changes-5.12.8
new file mode 100644
index 00000000000..5a474e9c08c
--- /dev/null
+++ b/dist/changes-5.12.8
@@ -0,0 +1,73 @@
+Qt 5.12.8 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.7.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.12.8 Changes                           *
+****************************************************************************
+
+General
+-------
+
+  - [QTBUG-81313] Enabled running with glibc 2.30 in Linux sandbox
+  - [QTBUG-81521] Update navigation actions when load finishes in a subframe
+  - [QTBUG-78490] Fixed crash when initiaing loads from urlChanged handlers
+
+Chromium
+--------
+
+  - Security fixes from Chromium up to version 80.0.3987.149, including:
+
+    - CVE-2019-18197 - Multiple vulnerabilities in XML
+    - CVE-2019-19923 - Out of bounds memory access in SQLite
+    - CVE-2019-19925 - Multiple vulnerabilities in SQLite
+    - CVE-2019-19926 - Inappropriate implementation in SQLite
+    - CVE-2019-20503 - Out of bounds read in usersctplib
+    - CVE-2020-6381 - Integer overflow in Javascript
+    - CVE-2020-6383 - Type confusion in V8
+    - CVE-2020-6384 - Use after free in WebAudio
+    - CVE-2020-6388 - Out of bounds memory access in WebAudio
+    - CVE-2020-6389 - Out of bounds write in WebRTC
+    - CVE-2020-6391 - Insufficient validation of untrusted input in Blink
+    - CVE-2020-6393 - Insufficient policy enforcement in Blink
+    - CVE-2020-6394 - Insufficient policy enforcement in Blink
+    - CVE-2020-6398 - Uninitialized use in PDFium
+    - CVE-2020-6399 - Insufficient policy enforcement in AppCache
+    - CVE-2020-6401
+    - CVE-2020-6405 - Out of bounds read in SQLite
+    - CVE-2020-6406 - Use after free in audio
+    - CVE-2020-6410 - Insufficient policy enforcement in navigation
+    - CVE-2020-6411
+    - CVE-2020-6412 - Insufficient validation of untrusted input in Omnibox
+    - CVE-2020-6413 - Inappropriate implementation in Blink
+    - CVE-2020-6418 - Type confusion in V8
+    - CVE-2020-6420 - Insufficient policy enforcement in media
+    - Security bug 1016038
+    - Security bug 1016506
+    - Security bug 1018629
+    - Security bug 1020031
+    - Security bug 1025442
+    - Security bug 1026293
+    - Security bug 1029865
+    - Security bug 1031909
+    - Security bug 1033461
+    - Security bug 1035723
+    - Security bug 1040700
+    - Security bug 1044570
+    - Security bug 1047097
+

From ed23d9f54b2c8735a6d4e8f4f171a5cd6700dd90 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 22 Apr 2020 16:32:52 +0200
Subject: [PATCH 23/46] Bump version

Change-Id: I61e1eca3a3841f698b566d0c52985a5e28d85544
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 075e95ecca3..6d88c717b79 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.12.8
+MODULE_VERSION = 5.12.9

From 1dae478232ac22a92637d919287fbbf11c32b7c7 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Tue, 7 Apr 2020 10:09:37 +0200
Subject: [PATCH 24/46] Fix macOS build after 10.15.4

QMAKE_MAC_SDK_VERSION is set by
/usr/bin/xcrun --sdk macosx --show-sdk-version
in qtbase/mkpecs/features/mac/sdk.prf

From 10.15.4, xcrun outputs the SDK version in Major.Minor.Patch format
instead of Major.Minor. mac_sdk_min gn arg is expected to be in
Major.Minor format, therefor pass only the first 2 revision numbers to
gn.

Fixes: QTBUG-83318
Change-Id: I3af523dd5df8149fb5cd57b259c2bed889db88b5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5d2026cb04ef8fd408e5722a84e2affb5b9a3119)
---
 src/core/config/mac_osx.pri | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 4426901cf71..7b77a8bf7f4 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -9,6 +9,10 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
      isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
 }
 
+# chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format.
+# If Patch version is provided it fails with "Exception: No Major.Minor.Patch+ SDK found"
+QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
+
 QMAKE_CLANG_DIR = "/usr"
 QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
 !isEmpty(QMAKE_CLANG_PATH) {
@@ -27,7 +31,7 @@ gn_args += \
     clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
     clang_use_chrome_plugins=false \
     mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
-    mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
+    mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \
     mac_views_browser=false \
     toolkit_views=false \
     use_external_popup_menu=false

From f3b941f98b61e205423f666c41f6922deff60d0a Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Fri, 5 Jun 2020 11:34:34 +0200
Subject: [PATCH 25/46] Update Chromium

Pulls in following patches:

* cab2fe0edbe  Disable Empty Base Class Layout Optimization for MSVC
* e7cf409b07f  [Backport] CVE-2020-6452
* d91969c6230  [Backport] CVE-2020-6450
* a54c653a3b8  [Backport] CVE-2020-6451
* 19363411c41  [Backport] Security Bug 1065094 1/2
* becfaac2ceb  [Backport] Security Bug 1065094 2/2
* f11657ed645  [Backport] Fix for CVE-2020-6423
* 4cdf74a64d3  Fixup: msvc undefined type HandleScopeImplementer

Task-number: QTBUG-84633
Change-Id: Ia621d7d04ce7bdedbdb57d6ef0472c896bb2f215
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 7483e059d88..4cdf74a64d3 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 7483e059d887136a989185d6056ccb79cf4ddd19
+Subproject commit 4cdf74a64d389d09c17377638d0e8164260aff67

From 6a6c89adf37dcaa47542ddc8b240c25f5b9d0e6d Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 8 Jun 2020 14:15:09 +0200
Subject: [PATCH 26/46] Skip all url interceptor unit tests

It is well known issue that url interceptors on 5.12 has
race condition on destruction, this is fixed in 5.13.1 and later.

Since this is just next end life LTS (having only security patches),
simply blacklist the tests to avoid flakiness on CI.

Change-Id: I20a493a42495f1a923cd56bc2b11f9485f50cdd7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 .../tst_qwebengineurlrequestinterceptor.cpp                      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index 653a1e421b8..7c99100eb40 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -83,6 +83,7 @@ void tst_QWebEngineUrlRequestInterceptor::cleanup()
 
 void tst_QWebEngineUrlRequestInterceptor::initTestCase()
 {
+     QSKIP("Interceptor has race condition in 5.12, skipping the test.");
 }
 
 void tst_QWebEngineUrlRequestInterceptor::cleanupTestCase()

From ad0e5a70736d23299fe73be78612e7e2ef84e00c Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 9 Jun 2020 09:59:19 +0200
Subject: [PATCH 27/46] Update Chromium

Pulls in following patches:

* d7755040dde  Update sqlite, fixing CVE-2020-6455
* d009d836cfb  [Backport] CVE-2020-6431
* bfc495cdeae  [Backport] Fix for CVE-2020-6441
* 130150732b6  [Backport] Fix for CVE-2020-6443
* 3269720fc8a  [Backport] Fix for security issue 1050090
* b96587fcf2c  [Backport] CVE-2020-6432
* 47b2198c4ef  [Backport] CVE-2020-6460

Task-number: QTBUG-84633
Change-Id: I9d45b6cc40cccbe4a8dc7931619cad60d6551217
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 4cdf74a64d3..47b2198c4ef 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 4cdf74a64d389d09c17377638d0e8164260aff67
+Subproject commit 47b2198c4ef00bee89c4b6c90bb2c0abdd8c1750

From 4215018f9b5f912785cf309b5bd8652cddc78ac4 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 10 Jun 2020 08:24:01 +0200
Subject: [PATCH 28/46] Update Chromium

Pulls in following changes:

* 04567666dae  [Backport] Fix for security issue 1066893
* 8dc8aecf84b  [Backport] When suspending context, don't clear handlers
* 8ad03010124  [Backport] Security bug 1025740 1/2
* c8b517eb447  [Backport] Security bug 1025740 2/2
* 717395cfce0  [Backport] CVE-2020-6461: Use after free in storage
* b3b4d5af3a1  Fixup: add missing gn include

Task-number: QTBUG-84633
Change-Id: Ia56b018ea93caa091212b574947b26dd83ca52f3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 47b2198c4ef..b3b4d5af3a1 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 47b2198c4ef00bee89c4b6c90bb2c0abdd8c1750
+Subproject commit b3b4d5af3a1f0560cc60b29787919144e1641ffc

From 1c1dddaf9aa35449096c75c26c93fc614a98b322 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 10 Jun 2020 16:38:21 +0200
Subject: [PATCH 29/46] Update Chormium

Pulls in following changes:

* 7c34012060d  [Backport] Fix for CVE-2020-6464
* c3a4dada23b  [Backport] CVE-2020-6468
* 8d8aa95903c  [Backport] Security bug 1075907
* e7c84adad1b  [Backport] Security bug 1025302
* d686675960c  [Backport] CVE-2020-6493
* 3a8febfdab7  Fixup for [Backport] Security bug 1025740 1/2

Task-number: QTBUG-84633
Change-Id: I9ad7da07ca0cdc4656cb936eef5a4e7445b31949
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index b3b4d5af3a1..3a8febfdab7 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit b3b4d5af3a1f0560cc60b29787919144e1641ffc
+Subproject commit 3a8febfdab725bf92b453dcd61cda85203a745e8

From e9b7199363ff3f0c8f84b96eee175292fafffb2c Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 11 Jun 2020 08:54:01 +0200
Subject: [PATCH 30/46] Update Chromium
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pulls in security issues:

* 1def46aafc2  [Backport] Security Bug 1070012 1/5
* 54a56516088  [Backport] Security Bug 1070012 2/5
* fbc701311c1  [Backport] Security Bug 1070012 3/5
* ebc9d4ba625  [Backport] Security Bug 1070012 4/5
* 04e8b821b36  [Backport] Security Bug 1070012 5/5
* 8a53e97dba1  [Backport] CVE-2020-6467

Task-number: QTBUG-84633
Change-Id: I24367d2f3249f900202b2f847a762aefd0ef4072
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 3a8febfdab7..8a53e97dba1 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 3a8febfdab725bf92b453dcd61cda85203a745e8
+Subproject commit 8a53e97dba1ec531727914b0189db93d21f977b8

From a5017ad1987d3368c1cbccb5085475055c3b74a5 Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Wed, 3 Jun 2020 13:51:20 +0300
Subject: [PATCH 31/46] Add changes file for Qt 5.12.9

Change-Id: I96949ad2a7be414c126b6a661bc5cceeeceaac7d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 dist/changes-5.12.9 | 55 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 dist/changes-5.12.9

diff --git a/dist/changes-5.12.9 b/dist/changes-5.12.9
new file mode 100644
index 00000000000..57badb1a30d
--- /dev/null
+++ b/dist/changes-5.12.9
@@ -0,0 +1,55 @@
+Qt 5.12.9 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.8.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.12.9 Changes                           *
+****************************************************************************
+
+General
+-------
+
+  - [QTBUG-83318] Fix macOS build after 10.15.4
+
+Chromium
+--------
+
+  - Security fixes from Chromium up to version 83.0.4103.97, including:
+
+    - CVE-2020-6423
+    - CVE-2020-6431
+    - CVE-2020-6432
+    - CVE-2020-6441
+    - CVE-2020-6443
+    - CVE-2020-6450
+    - CVE-2020-6451
+    - CVE-2020-6452
+    - CVE-2020-6455
+    - CVE-2020-6460
+    - CVE-2020-6461
+    - CVE-2020-6464
+    - CVE-2020-6467
+    - CVE-2020-6468
+    - CVE-2020-6493
+    - Security Bug 1025302
+    - Security Bug 1025740
+    - Security Bug 1050090
+    - Security Bug 1065094
+    - Security Bug 1066893
+    - Security Bug 1070012
+    - Security Bug 1075907

From 21a49fe1bdfdf78c464a2fad89113d30247f0c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Fri, 3 Jul 2020 01:16:07 +0200
Subject: [PATCH 32/46] [macOS] Add utf-8 character set meta tag for HTML
 clipboard content
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents unicode characters from becoming garbled when pasting the
clipboard content into an application that uses the HTML content
instead of the text data.

This mirrors the behavior of Chromium's clipboard adaptation for macOS

Fixes: QTBUG-75391
Change-Id: I033819a2caf3410509e90c9bc38c9830d184149d
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
(cherry picked from commit 7b5cb517da57f76437872a891c07fffd1779b6a4)
---
 src/core/clipboard_qt.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/clipboard_qt.cpp b/src/core/clipboard_qt.cpp
index 44756bdfe93..c3724d4090f 100644
--- a/src/core/clipboard_qt.cpp
+++ b/src/core/clipboard_qt.cpp
@@ -235,7 +235,14 @@ void ClipboardQt::WriteText(const char* text_data, size_t text_len)
 
 void ClipboardQt::WriteHTML(const char* markup_data, size_t markup_len, const char* url_data, size_t url_len)
 {
-    getUncommittedData()->setHtml(QString::fromUtf8(markup_data, markup_len));
+    QString markup_string = QString::fromUtf8(markup_data, markup_len);
+#if defined (Q_OS_MACOS)
+    // We need to prepend the charset on macOS to prevent garbled Unicode characters
+    // when pasting to certain applications (e.g. Notes, TextEdit)
+    // Mirrors the behavior in ui/base/clipboard/clipboard_mac.mm in Chromium.
+    markup_string.prepend(QLatin1String("<meta charset='utf-8'>"));
+#endif
+    getUncommittedData()->setHtml(markup_string);
 }
 
 void ClipboardQt::WriteRTF(const char* rtf_data, size_t data_len)

From 09015f8ee5e48e2211c60b69e7b76b8ce2ac8285 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 7 Jul 2020 10:41:45 +0200
Subject: [PATCH 33/46] Update Chormium

Pulls in following changes:

* 9b01ea0194d  [Backport] CVE-2020-6459
* 5d89aa45a7e  [Backport] CVE-2020-6470
* 73765c84da6  [Backport] CVE-2020-6474
* c66812623ff  [Backport] CVE-2020-6481
* 86482726e15  [Backport] Security Bug 1058515
* 120e629cb56  [Backport] Security Bug 1057369
* 4bd9fab8c65  [Backport] Security Bug 1051439
* cf563cfdb42  Add missing headers for build with linux-clang 10 spec
* 1417835f7de  Fixup: Fix live editing
* cf70b8331ce  [macOS] Add CoreProfile to the valid configurations for GPU switching

Task-number: QTBUG-84633
Change-Id: I16b148a6742c683dbc5eaab37bfbc4ddd3aebb0c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 8a53e97dba1..cf70b8331ce 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 8a53e97dba1ec531727914b0189db93d21f977b8
+Subproject commit cf70b8331ced814ac6f0ba5f81f9d5d0b4943e59

From fd483945e2c86aa0c3fc1465d179d7be39ec86bc Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Mon, 4 May 2020 14:08:47 +0200
Subject: [PATCH 34/46] Fix AltGr on Windows

Fixes: QTBUG-83710
Change-Id: Iaf5a33c0aeb53348d36cb7dda60602041299cd50
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 53498cb73392a222a113ae257f24f91e6d912518)
---
 src/core/web_event_factory.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index fc6287dd9b1..8042c091478 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -171,8 +171,15 @@ static QString qtTextForKeyEvent(const QKeyEvent *ev, int qtKey, Qt::KeyboardMod
 {
     QString text = ev->text();
 
-    if ((qtModifiers & Qt::ControlModifier) && keyboardDriver() == KeyboardDriver::Xkb)
+    if (keyboardDriver() == KeyboardDriver::Xkb && (qtModifiers & Qt::ControlModifier)) {
         text.clear();
+    }
+
+    // Keep text for Ctrl+Alt key combinations on Windows. It is an alternative for AltGr.
+    if (keyboardDriver() == KeyboardDriver::Windows
+            && (qtModifiers & Qt::ControlModifier) && !(qtModifiers & Qt::AltModifier)) {
+        text.clear();
+    }
 
     return text;
 }

From 0db0898f6a1d0e2292590946d0c8eea3b0847099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Wed, 29 Jul 2020 14:52:20 +0200
Subject: [PATCH 35/46] Update Chromium

Pulls in the changes:

a2c0edd19d4 [Backport] CVE-2020-6511: Side-channel information leakage in CSP (1/2)
b16fddc243a [Backport] CVE-2020-6511: Side-channel information leakage in CSP (2/2)
279102920a7 [Backport] CVE-2020-6513: Heap buffer overflow in PDFium
0521cd0d584 [Backport] CVE-2020-6514: Inappropriate implementation in WebRTC
53ab90f118d [Backport] CVE-2020-6523: Out of bounds write in Skia
618f960a12c [Backport] CVE-2020-6524: Heap buffer overflow in WebAudio
9c52e6b3360 [Backport] CVE-2020-6529: Inappropriate implementation in WebRTC
572a93d8f14 [Backport] CVE-2020-6535: Insufficient data validation in WebUI
2004c48a47e [Backport] Security bug 1054229
6a3ff8c66a9 [Backport] CVE-2020-6518: Use after free in developer tools
d06276e6183 [Backport] CVE-2020-6512: Type Confusion in V8 (1/3)
d8a0b1b22c1 [Backport] CVE-2020-6512: Type Confusion in V8 (2/3)
83793149bf5 [Backport] CVE-2020-6512: Type Confusion in V8 (3/3)
b97c5f89481 [Backport] Dependency for CVE-2020-6534 (1/4)
de381abe2ff [Backport] Dependency for CVE-2020-6534 (2/4)
8b2ba2a1e56 [Backport] Dependency for CVE-2020-6534 (3/4)
199df5c9049 [Backport] Dependency for CVE-2020-6534 (4/4)
bc33e1bbfaf [Backport] CVE-2020-6534: Heap buffer overflow in WebRTC
58f5e3f57e5 [Backport] CVE-2020-6490
c3003924faf [Backport] Security bug 1052492
1e1f4b33fa0 Security bugs 1087629 and 1029569

Task-number: QTBUG-85613
Change-Id: Ib2d3ed71b4f21cf3fa02474ace735a3c9c6c5126
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index cf70b8331ce..1e1f4b33fa0 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit cf70b8331ced814ac6f0ba5f81f9d5d0b4943e59
+Subproject commit 1e1f4b33fa024754d4db963531ab8e65c41d479f

From 9e356585680e45271d7691aedad211d0e8cadf32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Thu, 20 Aug 2020 14:56:28 +0200
Subject: [PATCH 36/46] Update Chromium

Pulls in the changes:
01257ab4c14 [Backport] CVE-2020-6489
e425d1134b9 [Backport] CVE-2020-6532: Use after free in SCTP
39d164c7113 [Backport] Security bug 1102408
72e1b27f06f [Backport] CVE-2020-6541: Use after free in WebUSB
bf12bcbd03c [Backport] Security bug 1065122
0561a33d0f5 [Backport] Security bug 1065731
ee1811a7e86 [Backport] CVE-2020-6540: Heap buffer overflow in Skia
a09bfbb191d [Backport] CVE-2020-6542: Use after free in ANGLE
2f38d2ab5b7 [Backport] CVE-2020-6543: Use after free in task scheduling
5ff9249f692 [Backport] CVE-2020-6544: Use after free in media
78121f30724 [Backport] CVE-2020-6545: Use after free in audio
cc48de17c5d [Backport] CVE-2020-6548: Heap buffer overflow in Skia
e490120c6b6 [Backport] CVE-2020-6549: Use after free in media
ca61def88f8 [Backport] CVE-2020-6462: Use after free in task scheduling

Task-number: QTBUG-85613
Change-Id: I3b3242d35a444b696ae89f9be454c800dbd2eba4
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 1e1f4b33fa0..ca61def88f8 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 1e1f4b33fa024754d4db963531ab8e65c41d479f
+Subproject commit ca61def88f8207d681846f576bc0d28a7b73afbc

From 8060a6ab6535e93e3baa4f0df48ea98dab1adc8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Mon, 12 Oct 2020 21:28:32 +0200
Subject: [PATCH 37/46] Update Chromium

Pulls in the changes:
b59af853f7b [Backport] CVE-2020-6559: Use after free in presentation API
d7c2cf25399 [Backport] Security issue 1102137
82a0e2faa2a [Backport] CVE-2020-6562: Insufficient policy enforcement in Blink
46dbf8fb796 [Backport] CVE-2020-6569: Integer overflow in WebUSB
844c2922f46 [Backport] CVE-2020-6573: Use after free in video
872be05931a [Backport] CVE-2020-15962: Insufficient policy enforcement in serial
b769634b87a [Backport] Security bug 1111149
a4599b61975 [Backport] CVE-2020-6571: Incorrect security UI in Omnibox
c89a12ce788 [Backport] CVE-2020-15964: Insufficient data validation in media
30570c933fc [Backport] Security issue 1098860
d6e06841443 [Backport] CVE-2020-15965: Out of bounds write in V8

Task-number: QTBUG-85613
Change-Id: I5a013d1020a903775dec3682866269eb754b7d08
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index ca61def88f8..d6e06841443 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit ca61def88f8207d681846f576bc0d28a7b73afbc
+Subproject commit d6e06841443a40c99efd209bce6c96c8a7659c34

From eac0b7e9fc3e0fad609a86f418358f1d56bf2a87 Mon Sep 17 00:00:00 2001
From: Jani Heikkinen <jani.heikkinen@qt.io>
Date: Wed, 14 Oct 2020 10:29:21 +0300
Subject: [PATCH 38/46] Bump version

Change-Id: I70d552fcc53d97ff8f44618f6c152d08dca7a9c0
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index 6d88c717b79..fffea1245fe 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
 load(qt_build_config)
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.12.9
+MODULE_VERSION = 5.12.10

From 74201ce4eb0354a6eeed935dbe5ebd92839c1f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Fri, 16 Oct 2020 01:13:44 +0200
Subject: [PATCH 39/46] Update Chromium

Pulls in the changes:
95bf758e9e5 [Backport] CVE-2020-15968: Use after free in Blink
0f55630c2f4 [Backport] CVE-2020-15969: Use after free in WebRTC.
5a8e372fc7e [Backport] CVE-2020-6561: Inappropriate implementation in Content Security Policy

Task-number: QTBUG-85613
Change-Id: I29c98f579dea07eddd86659972818aec43c5b85e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index d6e06841443..5a8e372fc7e 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit d6e06841443a40c99efd209bce6c96c8a7659c34
+Subproject commit 5a8e372fc7e646c359503b0f843ea8a2fa750f93

From 78b44a26b256fdaa70832455d8d4711bbe7fa17a Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Thu, 15 Oct 2020 09:53:18 +0300
Subject: [PATCH 40/46] Add changes file for Qt 5.12.10

Pick-to: dev 5.15 5.12
Change-Id: Id180c2ea2fefed919b4c623d20da392ad5db27d1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.10 | 86 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 dist/changes-5.12.10

diff --git a/dist/changes-5.12.10 b/dist/changes-5.12.10
new file mode 100644
index 00000000000..12e0c46d8ef
--- /dev/null
+++ b/dist/changes-5.12.10
@@ -0,0 +1,86 @@
+Qt 5.12.10 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.9.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  https://doc.qt.io/qt-5.12/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+General
+-------
+
+  - [QTBUG-75391] Fix pasting Unicode characters copied from WebEngine on macOS
+  - [QTBUG-83710] Fix input of keys requiring AltGr on Windows
+  - [QTBUG-84337] Fixed GPU switching with CoreProfile on macOS (for e.g. AirPlay)
+  - Fixed build with the linux-clang 10 spec
+
+Chromium
+--------
+
+  - Security fixes from Chromium up to version 86.0.4240.75, including:
+
+    - CVE-2020-6459
+    - CVE-2020-6462: Use after free in task scheduling
+    - CVE-2020-6470
+    - CVE-2020-6474
+    - CVE-2020-6481
+    - CVE-2020-6489
+    - CVE-2020-6490
+    - CVE-2020-6511: Side-channel information leakage in CSP
+    - CVE-2020-6512: Type Confusion in V8
+    - CVE-2020-6513: Heap buffer overflow in PDFium
+    - CVE-2020-6514: Inappropriate implementation in WebRTC
+    - CVE-2020-6518: Use after free in developer tools
+    - CVE-2020-6523: Out of bounds write in Skia
+    - CVE-2020-6524: Heap buffer overflow in WebAudio
+    - CVE-2020-6529: Inappropriate implementation in WebRTC
+    - CVE-2020-6532: Use after free in SCTP
+    - CVE-2020-6535: Insufficient data validation in WebUI
+    - CVE-2020-6534: Heap buffer overflow in WebRTC
+    - CVE-2020-6540: Heap buffer overflow in Skia
+    - CVE-2020-6541: Use after free in WebUSB
+    - CVE-2020-6542: Use after free in ANGLE
+    - CVE-2020-6543: Use after free in task scheduling
+    - CVE-2020-6544: Use after free in media
+    - CVE-2020-6545: Use after free in audio
+    - CVE-2020-6548: Heap buffer overflow in Skia
+    - CVE-2020-6549: Use after free in media
+    - CVE-2020-6559: Use after free in presentation API
+    - CVE-2020-6561: Inappropriate implementation in Content Security Policy
+    - CVE-2020-6562: Insufficient policy enforcement in Blink
+    - CVE-2020-6569: Integer overflow in WebUSB
+    - CVE-2020-6571: Incorrect security UI in Omnibox
+    - CVE-2020-6573: Use after free in video
+    - CVE-2020-15962: Insufficient policy enforcement in serial
+    - CVE-2020-15964: Insufficient data validation in media
+    - CVE-2020-15965: Out of bounds write in V8
+    - CVE-2020-15968: Use after free in Blink
+    - CVE-2020-15969: Use after free in WebRTC.
+    - Security Bug 1051439
+    - Security bug 1052492
+    - Security bug 1054229
+    - Security Bug 1057369
+    - Security Bug 1058515
+    - Security bug 1065122
+    - Security bug 1065731
+    - Security bugs 1087629 and 1029569
+    - Security issue 1098860
+    - Security issue 1102137
+    - Security bug 1102408
+    - Security bug 1111149
+

From 1b479d7aad7947714490a91bb4bb891f28469495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Mon, 19 Oct 2020 23:14:41 +0200
Subject: [PATCH 41/46] Update Chromium

Pulls in the change:
4e06eb9f1cc Fix bison 3.7

Task-number: QTBUG-86018
Change-Id: Ia8712c96b0fcbee1594a0b02b7555f0311d62287
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 5a8e372fc7e..4e06eb9f1cc 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 5a8e372fc7e646c359503b0f843ea8a2fa750f93
+Subproject commit 4e06eb9f1cc3af892c18cf0ae690efcb616f0a21

From 457c8baa8a3f577be1e999d06c32504d35862c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Mon, 19 Oct 2020 23:17:26 +0200
Subject: [PATCH 42/46] Update changes file for 5.12.10

Pick-to: dev 5.15 5.12
Change-Id: I01d63f447647c46fecf8df14c8c4df21189fd594
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.10 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/changes-5.12.10 b/dist/changes-5.12.10
index 12e0c46d8ef..5c27d328668 100644
--- a/dist/changes-5.12.10
+++ b/dist/changes-5.12.10
@@ -27,6 +27,7 @@ General
   - [QTBUG-75391] Fix pasting Unicode characters copied from WebEngine on macOS
   - [QTBUG-83710] Fix input of keys requiring AltGr on Windows
   - [QTBUG-84337] Fixed GPU switching with CoreProfile on macOS (for e.g. AirPlay)
+  - [QTBUG-86018] Fixed build with Bison 3.7
   - Fixed build with the linux-clang 10 spec
 
 Chromium

From 84c2ef0a59c87289abc81d7d74a1296fe00fbdb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Tue, 20 Oct 2020 11:14:48 +0200
Subject: [PATCH 43/46] Update Chromium

Pulls in the change:
1357b9be19f [Backport] CVE-2020-15999: Heap buffer overflow in freetype

Task-number: QTBUG-85613
Change-Id: I4af273921475f3235dadc87f92100cd43f56f796
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 4e06eb9f1cc..1357b9be19f 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 4e06eb9f1cc3af892c18cf0ae690efcb616f0a21
+Subproject commit 1357b9be19ff1b5c97ec6bb67c0d44677f93c5bb

From bc14b2ae1d9f757c0040cf6fb1d6333efc89c25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Tue, 20 Oct 2020 11:16:55 +0200
Subject: [PATCH 44/46] Update changes file for 5.12.10

Pick-to: dev 5.15 5.12

Change-Id: I11963ce31e082188b3dc39237bb530c915171898
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.10 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/changes-5.12.10 b/dist/changes-5.12.10
index 5c27d328668..a67744f70d2 100644
--- a/dist/changes-5.12.10
+++ b/dist/changes-5.12.10
@@ -72,6 +72,7 @@ Chromium
     - CVE-2020-15965: Out of bounds write in V8
     - CVE-2020-15968: Use after free in Blink
     - CVE-2020-15969: Use after free in WebRTC.
+    - CVE-2020-15999: Heap buffer overflow in freetype
     - Security Bug 1051439
     - Security bug 1052492
     - Security bug 1054229

From 0315918edfa9c554596ff3e0fb9a89c7b769c11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Thu, 22 Oct 2020 13:37:34 +0200
Subject: [PATCH 45/46] Update Chromium

Pulls in the changes:
1456539bd05 [Backport] CVE-2020-16003: Use after free in printing.
6475589b7ed [Backport] CVE-2020-16001: Use after free in media.
92253f4cc04 [Backport] CVE-2020-16002: Use after free in PDFium.

Task-number: QTBUG-87787
Change-Id: I8e3a52307e17bb881630ac7b6841b9ae19f4d5d7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/3rdparty b/src/3rdparty
index 1357b9be19f..92253f4cc04 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit 1357b9be19ff1b5c97ec6bb67c0d44677f93c5bb
+Subproject commit 92253f4cc04b8fddd238e2fc9309d8c33c8bdc05

From 07fcac049e7b362b703f31ec559f5097f804588e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
Date: Thu, 22 Oct 2020 13:40:45 +0200
Subject: [PATCH 46/46] Update changes file for 5.12.10

Pick-to: dev 5.15 5.12
Change-Id: Ifaccaed80bc0c45e7284ef85afa4a598d6d16aeb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 dist/changes-5.12.10 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dist/changes-5.12.10 b/dist/changes-5.12.10
index a67744f70d2..3f706d6b11c 100644
--- a/dist/changes-5.12.10
+++ b/dist/changes-5.12.10
@@ -33,7 +33,7 @@ General
 Chromium
 --------
 
-  - Security fixes from Chromium up to version 86.0.4240.75, including:
+  - Security fixes from Chromium up to version 86.0.4240.111, including:
 
     - CVE-2020-6459
     - CVE-2020-6462: Use after free in task scheduling
@@ -73,6 +73,9 @@ Chromium
     - CVE-2020-15968: Use after free in Blink
     - CVE-2020-15969: Use after free in WebRTC.
     - CVE-2020-15999: Heap buffer overflow in freetype
+    - CVE-2020-16001: Use after free in media.
+    - CVE-2020-16002: Use after free in PDFium.
+    - CVE-2020-16003: Use after free in printing.
     - Security Bug 1051439
     - Security bug 1052492
     - Security bug 1054229
