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 /src | |
| parent | bfcbdc3ab42880dc37ffa7174af96928ccf25f03 (diff) | |
| parent | 69351428413edb7a76ce2ca11634b1797e45e296 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Ic2fad2311550860c5a2f83b6f228a7a648131ece
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 1 | ||||
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 2 |
3 files changed, 1 insertions, 2 deletions
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 |