diff options
| -rw-r--r-- | src/core/api/core_api.pro | 10 | ||||
| -rw-r--r-- | src/core/api/qwebenginepage.cpp (renamed from src/webenginewidgets/api/qwebenginepage.cpp) | 3 | ||||
| -rw-r--r-- | src/core/api/qwebenginepage.h (renamed from src/webenginewidgets/api/qwebenginepage.h) | 8 | ||||
| -rw-r--r-- | src/core/api/qwebenginepage_p.h (renamed from src/webenginewidgets/api/qwebenginepage_p.h) | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 3 | ||||
| -rw-r--r-- | tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/origins/tst_origins.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/spellchecking/tst_spellchecking.cpp | 2 |
11 files changed, 19 insertions, 21 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 diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp index f9473cfc2..8416abfdb 100644 --- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp +++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp @@ -31,7 +31,7 @@ #include <QtWebEngineCore/qwebenginecallback.h> #include <QtWebEngineCore/qwebenginecookiestore.h> #include <QtWebEngineCore/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebenginepage.h> +#include <QtWebEngineCore/qwebenginepage.h> #include "httpserver.h" #include "httpreqrep.h" diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp index 88f0166c4..199eb4eb6 100644 --- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp +++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp @@ -32,7 +32,7 @@ #include <QtWebEngineCore/qwebengineurlrequestinterceptor.h> #include <QtWebEngineCore/qwebenginesettings.h> #include <QtWebEngineCore/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebenginepage.h> +#include <QtWebEngineCore/qwebenginepage.h> #include <httpserver.h> #include <httpreqrep.h> diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp index 72144265b..a16646f19 100644 --- a/tests/auto/widgets/origins/tst_origins.cpp +++ b/tests/auto/widgets/origins/tst_origins.cpp @@ -35,7 +35,7 @@ #include <QtWebEngineCore/qwebengineurlschemehandler.h> #include <QtWebEngineCore/qwebenginesettings.h> #include <QtWebEngineCore/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebenginepage.h> +#include <QtWebEngineCore/qwebenginepage.h> #if defined(WEBSOCKETS) #include <QtWebSockets/qwebsocket.h> diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp index a7571f98a..93a7c6acd 100644 --- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp +++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp @@ -37,9 +37,9 @@ #include <QtWebEngineCore/qwebengineurlschemehandler.h> #include <QtWebEngineCore/qwebenginesettings.h> #include <QtWebEngineCore/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebenginepage.h> -#include <QtWebEngineWidgets/qwebengineview.h> +#include <QtWebEngineCore/qwebenginepage.h> #include <QtWebEngineCore/qwebenginedownloadrequest.h> +#include <QtWebEngineWidgets/qwebengineview.h> #if QT_CONFIG(webengine_webchannel) #include <QWebChannel> diff --git a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp index 445ccf06e..258071559 100644 --- a/tests/auto/widgets/spellchecking/tst_spellchecking.cpp +++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp @@ -29,7 +29,7 @@ #include "util.h" #include <QtTest/QtTest> #include <QtWebEngineCore/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebenginepage.h> +#include <QtWebEngineCore/qwebenginepage.h> #include <QtWebEngineWidgets/qwebengineview.h> #include <qwebenginesettings.h> |