diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-08-27 15:25:30 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-20 10:47:15 +0100 |
commit | 50218deafeb52419bb45a451bbecf4819dd3ed39 (patch) | |
tree | e59ea7d17b3b7db1397fb6d05b3c3baf736bd0a9 /src | |
parent | c8418581e5f2c492ccdac7951ed648d78357f979 (diff) |
Move profile from widgets to core
This just moves class to core.
Task-nmuber: QTBUG-74585
Change-Id: Id046eee21043f086f5f45727bc3ce7c965695b7c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/api/core_api.pro | 7 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile.cpp (renamed from src/webenginewidgets/api/qwebengineprofile.cpp) | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile.h (renamed from src/webenginewidgets/api/qwebengineprofile.h) | 6 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile_p.h (renamed from src/webenginewidgets/api/qwebengineprofile_p.h) | 2 | ||||
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 3 |
5 files changed, 9 insertions, 11 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index c2909d6f0..ce9f840ba 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -59,7 +59,9 @@ HEADERS = \ qwebenginesettings.h \ qwebenginescript.h \ qwebenginescriptcollection.h \ - qwebenginescriptcollection_p.h + qwebenginescriptcollection_p.h \ + qwebengineprofile.h \ + qwebengineprofile_p.h SOURCES = \ qtwebenginecoreglobal.cpp \ @@ -81,7 +83,8 @@ SOURCES = \ qwebenginedownloadrequest.cpp \ qwebenginesettings.cpp \ qwebenginescript.cpp \ - qwebenginescriptcollection.cpp + qwebenginescriptcollection.cpp \ + qwebengineprofile.cpp # Chromium headers included are not remotely clean CONFIG -= warning_clean diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/core/api/qwebengineprofile.cpp index 942b969b0..bc8f295d9 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/core/api/qwebengineprofile.cpp @@ -39,7 +39,7 @@ #include "qwebengineprofile.h" #include "qwebengineprofile_p.h" - +#include "qwebenginenotification.h" #include "qwebenginecookiestore.h" #include "qwebenginedownloadrequest.h" #include "qwebenginedownloadrequest_p.h" diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h index 590f3d9ea..b2088cf5d 100644 --- a/src/webenginewidgets/api/qwebengineprofile.h +++ b/src/core/api/qwebengineprofile.h @@ -40,7 +40,7 @@ #ifndef QWEBENGINEPROFILE_H #define QWEBENGINEPROFILE_H -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtCore/qobject.h> #include <QtCore/qscopedpointer.h> @@ -57,15 +57,13 @@ class QWebEngineClientCertificateStore; class QWebEngineCookieStore; class QWebEngineDownloadRequest; class QWebEngineNotification; -class QWebEnginePage; -class QWebEnginePagePrivate; class QWebEngineProfilePrivate; class QWebEngineSettings; class QWebEngineScriptCollection; class QWebEngineUrlRequestInterceptor; class QWebEngineUrlSchemeHandler; -class QWEBENGINEWIDGETS_EXPORT QWebEngineProfile : public QObject { +class Q_WEBENGINECORE_EXPORT QWebEngineProfile : public QObject { Q_OBJECT public: explicit QWebEngineProfile(QObject *parent = Q_NULLPTR); diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/core/api/qwebengineprofile_p.h index 60fa4632f..4bec7d6dc 100644 --- a/src/webenginewidgets/api/qwebengineprofile_p.h +++ b/src/core/api/qwebengineprofile_p.h @@ -73,7 +73,7 @@ class QWebEngineProfilePrivate; class QWebEngineNotification; class QWebEngineSettings; -class QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient { +class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient { public: Q_DECLARE_PUBLIC(QWebEngineProfile) QWebEngineProfilePrivate(QtWebEngineCore::ProfileAdapter *profileAdapter); diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 4b29e4f76..034869adb 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -16,7 +16,6 @@ SOURCES = \ api/qwebenginehistory.cpp \ api/qwebenginenotificationpresenter.cpp \ api/qwebenginepage.cpp \ - api/qwebengineprofile.cpp \ api/qwebengineview.cpp \ render_widget_host_view_qt_delegate_widget.cpp @@ -27,8 +26,6 @@ HEADERS = \ api/qwebenginenotificationpresenter_p.h \ api/qwebenginepage.h \ api/qwebenginepage_p.h \ - api/qwebengineprofile.h \ - api/qwebengineprofile_p.h \ api/qwebengineview.h \ api/qwebengineview_p.h \ render_widget_host_view_qt_delegate_widget.h |