summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2018-06-15 09:54:16 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-06-15 09:13:33 +0000
commitfe73e5405716531e85440772f69ad74943024eee (patch)
tree2e5d65f4796e072e8d6f63e435ecec071585836a
parentbe6e95a695aeda96ed315dcb07e8b60e05e2fd48 (diff)
Update Chromium and changelogv5.11.1
Pulls in following commits: * bad02200 [Backport] CVE-2018-6149 * 8cc9828a Workaround long path issue on Window * b42eb615 [Backport] gpu: Address piman's nits from crrev.com/c/969639 Change-Id: I3077df475503db990988ff0ab42724d11341db25 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--dist/changes-5.11.14
m---------src/3rdparty0
2 files changed, 3 insertions, 1 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1
index 88d0bacc..2d082068 100644
--- a/dist/changes-5.11.1
+++ b/dist/changes-5.11.1
@@ -32,7 +32,7 @@ Chromium
--------
- Updated Chromium to 65.0.3325.230
- - Security fixes from Chromium up to version 67.0.3396.79, including:
+ - Security fixes from Chromium up to version 67.0.3396.87, including:
* CVE-2018-6120
* CVE-2018-6123
* CVE-2018-6124
@@ -50,6 +50,7 @@ Chromium
* CVE-2018-6144
* CVE-2018-6145
* CVE-2018-6148
+ * CVE-2018-6149
* Security Bug 826946
* Security Bug 826193
* Security Bug 825524
@@ -85,6 +86,7 @@ Build
* [QTBUG-67977] Cleanup pdfium_document_wrapper_qt.h include
* [QTBUG-68439] Do make freetype checks in Qt Gui and Qt WebEngine orthogonal
* [QTBUG-67983] Fix hostcompiler test for qt 'root' build
+ * [QTBUG-68464] Workaround long path issue on Windows
* Fix build without qtlocation
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 94a0b51526ced8d7649e78ec035b3aa1949c854
+Subproject bad02200c68d7e0c758dc4f1805e58d0e03fdea