diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-08 14:21:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-08 14:22:03 +0200 |
| commit | 0777ba3f60a986e7c26f20e1b95a052856ecc6cb (patch) | |
| tree | cda33363905b854db6511eda1b71409c2d67060c | |
| parent | bfcbdc3ab42880dc37ffa7174af96928ccf25f03 (diff) | |
| parent | 69351428413edb7a76ce2ca11634b1797e45e296 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Ic2fad2311550860c5a2f83b6f228a7a648131ece
| -rw-r--r-- | dist/changes-5.6.1 | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 1 | ||||
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 index 5a568bda9..50ab2c7fe 100644 --- a/dist/changes-5.6.1 +++ b/dist/changes-5.6.1 @@ -23,7 +23,7 @@ information about a particular change. **************************************************************************** - Chromium Snapshot: - * Security fixes from Chromium up to version 50.0.2661.94 + * Security fixes from Chromium up to version 51.0.2704.63 * [QTBUG-52602] Fixed devtools so it works with newer Chrome releases. * [QTBUG-52085, QTBUG-53108] qrc urls can now load local files. diff --git a/src/3rdparty b/src/3rdparty -Subproject 19e3d1d3af80efee4377a4e5fcb9c214dba5be4 +Subproject dc08e3972d36a63dd477de0de005b3e81a5674d diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 98d0bbc1d..93ef9e4fb 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -51,6 +51,7 @@ #include <private/qtwebengineglobal_p.h> #include "qquickwebenginescript_p.h" #include <QQuickItem> +#include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 40e8c2728..f96949ec2 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -4,8 +4,6 @@ project = QtWebEngine description = Qt WebEngine Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebengine - qhp.projects = QtWebEngine qhp.QtWebEngine.file = qtwebengine.qhp |