diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-26 09:45:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-26 09:45:43 +0200 |
| commit | 8237511008afdde2cbe382a427560db5f5b7efb6 (patch) | |
| tree | 9090b7984d296ea1880392f18e2d53d8c81e5cb2 | |
| parent | 0a6c8a8871085dcd8b029553260031892be3603e (diff) | |
| parent | 628f7c1de60f66f4b2e179c98bf403f647d8ad60 (diff) | |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.0
Change-Id: I01bc98f034ea26414d071fc42fe20bd0b7534b9e
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 1 | ||||
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index d287b46ca..b72f79f30 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -54,6 +54,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 baa4a9859..6d946c9c9 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 |