summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2016-05-26 18:03:47 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-05-26 18:03:47 +0000
commit96df24618fbbc0e06a24e93b7e9aefb0f923f4af (patch)
tree91e08a0fb1c63be5188fec52b193843394a1a7fa
parente3043c0680bb7f3cdf0ba18cce12969045f79e01 (diff)
parent8237511008afdde2cbe382a427560db5f5b7efb6 (diff)
Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.7.0" into refs/staging/5.7.0v5.7.0-rc1
-rw-r--r--src/webengine/api/qquickwebengineview_p.h1
-rw-r--r--src/webengine/doc/qtwebengine.qdocconf2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index d287b46c..b72f79f3 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 baa4a985..6d946c9c 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