From 28ec64afab5b397be05bb75e2c99a35b3f31437d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 24 Jul 2020 16:40:02 +0200 Subject: Update Chromium Pulls in the changes: 7e405525e92 [Backport] CVE-2020-6530: Out of bounds memory access in developer tools 99fe8bdb44a [Backport] CVE-2020-6531: Side-channel information leakage in scroll to text 52367e8e753 [Backport] Security bug 1065731 d61a4348c47 Fix WebAuth build 9222c8b73ab [Backport] Security bug 1054229 c3d5696193a [Backport] Security bug 1065122 9b27a193c63 [Backport] Dependency for CVE-2020-6534 0b8e0d451a3 [Backport] CVE-2020-6534: Heap buffer overflow in WebRTC 0a4240a9c42 FIXUP: Fix WebAuth build Task-number: QTBUG-85606 Change-Id: I2995f9c3ea4b63fc8af1699a377c2d74359c67a8 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 288befc5a..0a4240a9c 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 288befc5a1e59a30bac5aa26b82e8b8a569c1b33 +Subproject commit 0a4240a9c428d71656637ad4486d92bfeb52af93 -- cgit v1.2.3 From a283bf53c4cc81ec14d19a492c412191394b350c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 27 Jul 2020 14:38:24 +0200 Subject: Do not evaluate NINJA_TARGETDEPS It is just a file path. Fixes qmake linking when chromium changes. Change-Id: Ib2f0976a6dc3c90c415b69e1876706bc2397d134 Reviewed-by: Peter Varga --- src/buildtools/config/linking.pri | 3 +-- src/process/process.pro | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/buildtools/config/linking.pri b/src/buildtools/config/linking.pri index 0ee18f3a5..e4f40ba71 100644 --- a/src/buildtools/config/linking.pri +++ b/src/buildtools/config/linking.pri @@ -71,5 +71,4 @@ linux { QMAKE_LFLAGS += $$NINJA_LFLAGS } -POST_TARGETDEPS += $$eval($$NINJA_TARGETDEPS) - +POST_TARGETDEPS += $$NINJA_TARGETDEPS diff --git a/src/process/process.pro b/src/process/process.pro index 66fdf9797..a90548f9c 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -27,7 +27,7 @@ win32 { LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS $$NINJA_ARCHIVES $$NINJA_OBJECTS QMAKE_LFLAGS += $$NINJA_LFLAGS - POST_TARGETDEPS += $$eval($$NINJA_TARGETDEPS) + POST_TARGETDEPS += $$NINJA_TARGETDEPS CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir() INCLUDEPATH += $$CHROMIUM_SRC_DIR \ -- cgit v1.2.3