Move QWebEnginePage to core

[ChangeLog] QWebEnginePage is in QtWebEngineCore

Task-number: QTBUG-74585
Change-Id: Id326c89c868e9e7d53488bbd12cb321e1a0b79b7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

6 files changed, 13 insertions, 15 deletions

diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 95095a2f7..e68d4bd8b 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -4,7 +4,7 @@ DESTDIR = $$OUT_PWD/$$getConfigDir()
 TEMPLATE = lib
 
 CONFIG += staticlib
-QT += network core-private webenginecoreheaders-private quick
+QT += network core-private webenginecoreheaders-private quick printsupport qml #fixme
 
 # Don't create .prl file for this intermediate library because
 # their contents get used when linking against them, breaking
@@ -64,8 +64,9 @@ HEADERS = \
     qwebengineprofile_p.h \
     qwebengineclientcertificateselection.h \
     qwebenginehistory.h \
-    qwebenginehistory_p.h
-
+    qwebenginehistory_p.h \
+    qwebenginepage.h \
+    qwebenginepage_p.h
 
 SOURCES = \
     qtwebenginecoreglobal.cpp \
@@ -90,7 +91,8 @@ SOURCES = \
     qwebenginescriptcollection.cpp \
     qwebengineprofile.cpp \
     qwebengineclientcertificateselection.cpp \
-    qwebenginehistory.cpp
+    qwebenginehistory.cpp \
+    qwebenginepage.cpp
 
 # Chromium headers included are not remotely clean
 CONFIG -= warning_clean
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index c91f6dfad..5e029714d 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -64,7 +64,7 @@
 #include "qwebenginescriptcollection_p.h"
 #include "qwebenginesettings.h"
 #include "user_notification_controller.h"
-#include "render_widget_host_view_qt_delegate_widget.h"
+#include "render_widget_host_view_qt_delegate.h"
 #include "web_contents_adapter.h"
 #include "web_engine_settings.h"
 #include "qwebenginescript.h"
@@ -76,7 +76,6 @@
 #include <QClipboard>
 #include <QKeyEvent>
 #include <QIcon>
-#include <QLayout>
 #include <QLoggingCategory>
 #include <QMimeData>
 #if QT_CONFIG(webengine_printing_and_pdf)
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/core/api/qwebenginepage.h
index d96dcf4d0..09b7b54df 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/core/api/qwebenginepage.h
@@ -40,7 +40,7 @@
 #ifndef QWEBENGINEPAGE_H
 #define QWEBENGINEPAGE_H
 
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 #include <QtWebEngineCore/qwebengineclientcertificateselection.h>
 #include <QtWebEngineCore/qwebenginedownloadrequest.h>
 #include <QtWebEngineCore/qwebenginecallback.h>
@@ -73,7 +73,7 @@ class QWebEngineScriptCollection;
 class QWebEngineSettings;
 class QWebEngineUrlRequestInterceptor;
 
-class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEnginePage : public QObject {
     Q_OBJECT
     Q_PROPERTY(QString selectedText READ selectedText)
     Q_PROPERTY(bool hasSelection READ hasSelection)
@@ -395,9 +395,9 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QWebEnginePage::FindFlags)
 
-QWEBENGINEWIDGETS_EXPORT QDataStream &operator<<(QDataStream &stream,
+Q_WEBENGINECORE_EXPORT QDataStream &operator<<(QDataStream &stream,
                                                  const QWebEngineHistory &history);
-QWEBENGINEWIDGETS_EXPORT QDataStream &operator>>(QDataStream &stream, QWebEngineHistory &history);
+Q_WEBENGINECORE_EXPORT QDataStream &operator>>(QDataStream &stream, QWebEngineHistory &history);
 
 QT_END_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index cce8e90f5..d2101e49f 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -106,7 +106,7 @@ public:
     virtual QObject *accessibilityParentObject() = 0;
 };
 
-class QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
 {
 public:
     Q_DECLARE_PUBLIC(QWebEnginePage)
diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h
index 06fbc5ddf..d7f9d6a45 100644
--- a/src/webenginewidgets/api/qwebengineview.h
+++ b/src/webenginewidgets/api/qwebengineview.h
@@ -45,7 +45,7 @@
 #include <QtWidgets/qwidget.h>
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineWidgets/qwebenginepage.h>
+#include <QtWebEngineCore/qwebenginepage.h>
 #include <QtWebEngineCore/qwebenginehttprequest.h>
 #include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index be47ad3a4..e726bdc8c 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -13,15 +13,12 @@ INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api
 
 SOURCES = \
         api/qwebenginenotificationpresenter.cpp \
-        api/qwebenginepage.cpp \
         api/qwebengineview.cpp \
         render_widget_host_view_qt_delegate_widget.cpp
 
 HEADERS = \
         api/qtwebenginewidgetsglobal.h \
         api/qwebenginenotificationpresenter_p.h \
-        api/qwebenginepage.h \
-        api/qwebenginepage_p.h \
         api/qwebengineview.h \
         api/qwebengineview_p.h \
         render_widget_host_view_qt_delegate_widget.h