summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-03-03 15:59:39 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-03-03 16:02:28 +0000
commit5c4ae298b0a3d75c4c5ea8aef0595914ab25607f (patch)
tree1c95af18e6610cdb0e32eed5182c5ad431cdf573
parentae99405b472babf07b21040444efbdee55a387e9 (diff)
Cherry-pick security fixes from Chromium 49v5.6.0
Update the Chromium SHA1 to include security fixes cherry-picked from the Chromium 49 release. Change-Id: Ia5ec7311a65bac886ed13f880b79242712e32ab9 Task-number: QTBUG-51636 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
-rw-r--r--dist/changes-5.6.02
m---------src/3rdparty0
2 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0
index f6495942..a4999f32 100644
--- a/dist/changes-5.6.0
+++ b/dist/changes-5.6.0
@@ -21,7 +21,7 @@ information about a particular change.
- Chromium Snapshot:
* The Chromium version has been updated to 45.0.2554.101.
- * In addition security fixes from Chromium 46, 47 and 48 have been merged.
+ * In addition security fixes from Chromium 46 - 49 have been merged.
- General:
* The WebEngineCore module now contains shared C++ API.
diff --git a/src/3rdparty b/src/3rdparty
-Subproject d7c3815f9a15c3c287bcece25cc26a2a6961f0b
+Subproject cbe3845eff59c2d1726ed3dc0f934f7f483a127