From 665c422803e9d6767f9fa2fd69964c03a254167b Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 21 Mar 2016 13:56:20 +0100 Subject: Fix CommandLine initialization on Windows Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index cbe3845ef..3b2b78caa 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit cbe3845eff59c2d1726ed3dc0f934f7f483a1271 +Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1 -- cgit v1.2.3 From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 24 Mar 2016 13:55:28 +0100 Subject: Use system NSS only for certificate handling Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 [Backport] update to libpng 1.2.56 34857b8 [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index 3b2b78caa..0a385bb01 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1 +Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96 -- cgit v1.2.3 From 409fe7849e9ce12c03ff674b6e3a28f61805069e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 5 Apr 2016 10:30:55 +0200 Subject: Update Chromium Pulls in security fixes from Chromium 49.0.2623.108 Change-Id: Icb318aa21772eecb4b39f2bbe92ccdc0f020aee3 Reviewed-by: Joerg Bornemann --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index 0a385bb01..5e09f6c06 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96 +Subproject commit 5e09f6c06e4c660924d483d01411e3c47ee0ef74 -- cgit v1.2.3 From 56955e73d4be21bc3f086d1c805352a96944a25c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 6 Apr 2016 17:10:36 +0200 Subject: Update Chromium Pulls in build fix for MSVC 2015 Update 2. Task-number: QTBUG-52367 Change-Id: I57f17388b280eb79397cbba3e6b1b546d30be096 Reviewed-by: Michal Klocek --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty') diff --git a/src/3rdparty b/src/3rdparty index 5e09f6c06..653f475d9 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 5e09f6c06e4c660924d483d01411e3c47ee0ef74 +Subproject commit 653f475d91df7c9d0b973e89dad8b72f3aeceb40 -- cgit v1.2.3