Add WebEngineWidgets, WebEngineQuick modules cmake build

Fix some library dependencies and make proper header includes
in core.

Task-number: QTBUG-91760
Change-Id: I415361dd42ef2cc39716ce3f5f56e6e8556ac4c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

16 files changed, 23 insertions, 28 deletions

diff --git a/src/core/authentication_dialog_controller.h b/src/core/authentication_dialog_controller.h
index 631a95c34..ef2f2c724 100644
--- a/src/core/authentication_dialog_controller.h
+++ b/src/core/authentication_dialog_controller.h
@@ -51,8 +51,7 @@
 #ifndef AUTHENTICATION_DIALOG_CONTROLLER_H
 #define AUTHENTICATION_DIALOG_CONTROLLER_H
 
-#include "qtwebenginecoreglobal_p.h"
-
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QObject>
 
 namespace QtWebEngineCore {
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h
index 3a733f56f..e98c15802 100644
--- a/src/core/client_cert_select_controller.h
+++ b/src/core/client_cert_select_controller.h
@@ -51,7 +51,7 @@
 #ifndef CLIENT_CERT_SELECT_CONTROLLER_H
 #define CLIENT_CERT_SELECT_CONTROLLER_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QtNetwork/qtnetwork-config.h>
 
 #include <QtCore/QUrl>
diff --git a/src/core/color_chooser_controller.h b/src/core/color_chooser_controller.h
index 66222bb77..493847f4e 100644
--- a/src/core/color_chooser_controller.h
+++ b/src/core/color_chooser_controller.h
@@ -51,8 +51,7 @@
 #ifndef COLOR_CHOOSER_CONTROLLER_H
 #define COLOR_CHOOSER_CONTROLLER_H
 
-#include "qtwebenginecoreglobal_p.h"
-
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QObject>
 
 QT_FORWARD_DECLARE_CLASS(QColor)
diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h
index 316178891..6e9a13e48 100644
--- a/src/core/compositor/compositor.h
+++ b/src/core/compositor/compositor.h
@@ -40,7 +40,7 @@
 #ifndef COMPOSITOR_H
 #define COMPOSITOR_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 class QImage;
diff --git a/src/core/favicon_manager.h b/src/core/favicon_manager.h
index a8247d15f..a6e5822a9 100644
--- a/src/core/favicon_manager.h
+++ b/src/core/favicon_manager.h
@@ -51,7 +51,7 @@
 #ifndef FAVICON_MANAGER_H
 #define FAVICON_MANAGER_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <memory>
 #include <QtCore/QMap>
 #include <QtCore/QObject>
diff --git a/src/core/file_picker_controller.h b/src/core/file_picker_controller.h
index 0b84c889e..bba0bae37 100644
--- a/src/core/file_picker_controller.h
+++ b/src/core/file_picker_controller.h
@@ -51,8 +51,7 @@
 #ifndef FILE_PICKER_CONTROLLER_H
 #define FILE_PICKER_CONTROLLER_H
 
-#include "qtwebenginecoreglobal_p.h"
-
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QObject>
 #include <QStringList>
 
diff --git a/src/core/find_text_helper.h b/src/core/find_text_helper.h
index 9843dc8b5..8a19b15d8 100644
--- a/src/core/find_text_helper.h
+++ b/src/core/find_text_helper.h
@@ -51,9 +51,8 @@
 #ifndef FIND_TEXT_HELPER_H
 #define FIND_TEXT_HELPER_H
 
-#include "qtwebenginecoreglobal_p.h"
-
-#include "qwebenginecallback_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
+#include <QtWebEngineCore/private/qwebenginecallback_p.h>
 #include <QJSValue>
 
 namespace content {
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index e6e9ab7cb..fecb338ad 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -51,7 +51,7 @@
 #ifndef PROFILE_ADAPTER_H
 #define PROFILE_ADAPTER_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 
 #include <QEnableSharedFromThis>
 #include <QList>
@@ -59,10 +59,10 @@
 #include <QScopedPointer>
 #include <QString>
 
-#include "api/qwebengineclientcertificatestore.h"
-#include "api/qwebenginecookiestore.h"
-#include "api/qwebengineurlrequestinterceptor.h"
-#include "api/qwebengineurlschemehandler.h"
+#include <QtWebEngineCore/qwebengineclientcertificatestore.h>
+#include <QtWebEngineCore/qwebenginecookiestore.h>
+#include <QtWebEngineCore/qwebengineurlrequestinterceptor.h>
+#include <QtWebEngineCore/qwebengineurlschemehandler.h>
 #include "net/qrc_url_scheme_handler.h"
 
 QT_FORWARD_DECLARE_CLASS(QObject)
diff --git a/src/core/profile_adapter_client.h b/src/core/profile_adapter_client.h
index 07c00044b..6a2ce6ba0 100644
--- a/src/core/profile_adapter_client.h
+++ b/src/core/profile_adapter_client.h
@@ -51,7 +51,7 @@
 #ifndef PROFILE_ADAPTER_CLIENT_H
 #define PROFILE_ADAPTER_CLIENT_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QSharedPointer>
 #include <QString>
 #include <QUrl>
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
index f9306dba9..1df1322c7 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -51,8 +51,7 @@
 #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H
 #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H
 
-#include "qtwebenginecoreglobal_p.h"
-
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QtCore/QRect>
 #include <QtGui/QColor>
 #include <QtGui/QCursor>
diff --git a/src/core/touch_handle_drawable_client.h b/src/core/touch_handle_drawable_client.h
index a2c87948a..d7db78f02 100644
--- a/src/core/touch_handle_drawable_client.h
+++ b/src/core/touch_handle_drawable_client.h
@@ -40,7 +40,7 @@
 #ifndef TOUCH_HANDLE_DRAWABLE_CLIENT_H
 #define TOUCH_HANDLE_DRAWABLE_CLIENT_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QRect>
 
 namespace QtWebEngineCore {
diff --git a/src/core/touch_selection_menu_controller.h b/src/core/touch_selection_menu_controller.h
index 34137b05b..8955c7294 100644
--- a/src/core/touch_selection_menu_controller.h
+++ b/src/core/touch_selection_menu_controller.h
@@ -40,7 +40,7 @@
 #ifndef TOUCH_SELECTION_MENU_CONTROLLER_H
 #define TOUCH_SELECTION_MENU_CONTROLLER_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 #include <QtCore/QObject>
 
 namespace QtWebEngineCore {
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index ef710579b..b05ddeb4d 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -51,8 +51,8 @@
 #ifndef WEB_CONTENTS_ADAPTER_H
 #define WEB_CONTENTS_ADAPTER_H
 
-#include "qtwebenginecoreglobal_p.h"
-#include "qwebenginecontextmenurequest_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
+#include <QtWebEngineCore/private/qwebenginecontextmenurequest_p.h>
 #include "web_contents_adapter_client.h"
 #include <memory>
 #include <QtGui/qtgui-config.h>
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 1e2c7bbec..d9fab8fbb 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -51,7 +51,7 @@
 #ifndef WEB_CONTENTS_ADAPTER_CLIENT_H
 #define WEB_CONTENTS_ADAPTER_CLIENT_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 
 #include "profile_adapter.h"
 
diff --git a/src/core/web_engine_error.h b/src/core/web_engine_error.h
index cda9e4625..7277ffa9d 100644
--- a/src/core/web_engine_error.h
+++ b/src/core/web_engine_error.h
@@ -51,7 +51,7 @@
 #ifndef WEB_ENGINE_ERROR_H
 #define WEB_ENGINE_ERROR_H
 
-#include "qtwebenginecoreglobal_p.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 
 class Q_WEBENGINECORE_PRIVATE_EXPORT WebEngineError
 {
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 5d00a5d6f..a2366e2f6 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -51,8 +51,8 @@
 #ifndef WEB_ENGINE_SETTINGS_H
 #define WEB_ENGINE_SETTINGS_H
 
-#include "qtwebenginecoreglobal_p.h"
-#include "qwebenginesettings.h"
+#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
+#include <QtWebEngineCore/qwebenginesettings.h>
 #include <QScopedPointer>
 #include <QHash>
 #include <QUrl>