diff options
author | Michal Klocek <michal.klocek@qt.io> | 2020-10-09 10:41:39 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-20 15:52:12 +0100 |
commit | 3c714771649dd352fd11f63036f1efd04a81801b (patch) | |
tree | e0447024d6611e000eee991422c5a97646d3b256 | |
parent | 8f77aa42d2b5b67116a095c41040003265c820c7 (diff) |
Move client certificate selection to core
[ChangeLog] QWebEngineClientCertificateSelection is in QtWebEngineCore
Task-number: QTBUG-74585
Change-Id: I35aab40a15b4c29bdc8c291fe7920158140e70b2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/api/core_api.pro | 6 | ||||
-rw-r--r-- | src/core/api/qwebengineclientcertificateselection.cpp (renamed from src/webenginewidgets/api/qwebengineclientcertificateselection.cpp) | 0 | ||||
-rw-r--r-- | src/core/api/qwebengineclientcertificateselection.h (renamed from src/webenginewidgets/api/qwebengineclientcertificateselection.h) | 4 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 2 | ||||
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index ce9f840ba..ac7313a1a 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -61,7 +61,8 @@ HEADERS = \ qwebenginescriptcollection.h \ qwebenginescriptcollection_p.h \ qwebengineprofile.h \ - qwebengineprofile_p.h + qwebengineprofile_p.h \ + qwebengineclientcertificateselection.h SOURCES = \ qtwebenginecoreglobal.cpp \ @@ -84,7 +85,8 @@ SOURCES = \ qwebenginesettings.cpp \ qwebenginescript.cpp \ qwebenginescriptcollection.cpp \ - qwebengineprofile.cpp + qwebengineprofile.cpp \ + qwebengineclientcertificateselection.cpp # Chromium headers included are not remotely clean CONFIG -= warning_clean diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp b/src/core/api/qwebengineclientcertificateselection.cpp index febfe0a21..febfe0a21 100644 --- a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp +++ b/src/core/api/qwebengineclientcertificateselection.cpp diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.h b/src/core/api/qwebengineclientcertificateselection.h index 165194aac..81c626f73 100644 --- a/src/webenginewidgets/api/qwebengineclientcertificateselection.h +++ b/src/core/api/qwebengineclientcertificateselection.h @@ -40,7 +40,7 @@ #ifndef QWEBENGINECLIENTCERTSELECTION_H #define QWEBENGINECLIENTCERTSELECTION_H -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtNetwork/qtnetwork-config.h> #include <QtCore/qlist.h> #include <QtCore/qscopedpointer.h> @@ -52,7 +52,7 @@ class ClientCertSelectController; QT_BEGIN_NAMESPACE -class QWEBENGINEWIDGETS_EXPORT QWebEngineClientCertificateSelection { +class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateSelection { public: QWebEngineClientCertificateSelection(const QWebEngineClientCertificateSelection &); ~QWebEngineClientCertificateSelection(); diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index f842a5eb1..b0b447c22 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -41,7 +41,7 @@ #define QWEBENGINEPAGE_H #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> -#include <QtWebEngineWidgets/qwebengineclientcertificateselection.h> +#include <QtWebEngineCore/qwebengineclientcertificateselection.h> #include <QtWebEngineCore/qwebenginedownloadrequest.h> #include <QtWebEngineCore/qwebenginecallback.h> #include <QtWebEngineCore/qwebenginehttprequest.h> diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index 034869adb..788554ae3 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -12,7 +12,6 @@ QT_PRIVATE += quick-private gui-private core-private widgets-private quickwidget INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api SOURCES = \ - api/qwebengineclientcertificateselection.cpp \ api/qwebenginehistory.cpp \ api/qwebenginenotificationpresenter.cpp \ api/qwebenginepage.cpp \ @@ -21,7 +20,6 @@ SOURCES = \ HEADERS = \ api/qtwebenginewidgetsglobal.h \ - api/qwebengineclientcertificateselection.h \ api/qwebenginehistory.h \ api/qwebenginenotificationpresenter_p.h \ api/qwebenginepage.h \ |