diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 12:19:11 +0200 |
| commit | 7439343d169095a510d122ad7c69646a5946cdce (patch) | |
| tree | 8540b2bac1e495533585a645e216eaab66b06bd2 /src/webenginewidgets | |
| parent | 3ecd61aea90cc4b283ffe9409cc10f5fd3476ecf (diff) | |
| parent | f8c132ffb7cd32d52bbfe09caa811665a3cb1069 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ie4abadb076c51d070cbb05f29b9ebcd9705933ad
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginecontextmenudata.h | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginefullscreenrequest.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.h b/src/webenginewidgets/api/qwebenginecontextmenudata.h index 1a2ff8de4..97cfe9f65 100644 --- a/src/webenginewidgets/api/qwebenginecontextmenudata.h +++ b/src/webenginewidgets/api/qwebenginecontextmenudata.h @@ -40,7 +40,7 @@ #ifndef QWEBENGINECONTEXTDATA_H #define QWEBENGINECONTEXTDATA_H -#include <qtwebenginewidgetsglobal.h> +#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> #include <QtCore/qurl.h> diff --git a/src/webenginewidgets/api/qwebenginefullscreenrequest.h b/src/webenginewidgets/api/qwebenginefullscreenrequest.h index 138a76e08..e5f2b7b19 100644 --- a/src/webenginewidgets/api/qwebenginefullscreenrequest.h +++ b/src/webenginewidgets/api/qwebenginefullscreenrequest.h @@ -40,9 +40,9 @@ #ifndef QWEBENGINEFULLSCREENREQUEST_H #define QWEBENGINEFULLSCREENREQUEST_H -#include <qtwebenginewidgetsglobal.h> -#include <qurl.h> -#include <qpointer.h> +#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtCore/qurl.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE class QWebEnginePage; |