Remove the use of Q_WEBENGINECORE_PRIVATE_EXPORT

Task-number: QTBUG-117983
Change-Id: I3f5b90c0d43071a5c8ebc4096995ce5e1e65aebb
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

41 files changed, 45 insertions, 47 deletions

diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index a379a8dfe..d5112ccb3 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -42,7 +42,7 @@ static void deleteShareContext()
 // after the QGuiApplication creation, when AA_ShareOpenGLContexts fills
 // the same need but the flag has to be set earlier.
 
-Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
+Q_WEBENGINECORE_EXPORT void initialize()
 {
 #if QT_CONFIG(opengl) && !defined(Q_OS_MACOS)
 #ifdef Q_OS_WIN32
diff --git a/src/core/api/qtwebenginecoreglobal_p.h b/src/core/api/qtwebenginecoreglobal_p.h
index 6bd1c5a06..a63568c8a 100644
--- a/src/core/api/qtwebenginecoreglobal_p.h
+++ b/src/core/api/qtwebenginecoreglobal_p.h
@@ -27,18 +27,16 @@
 #define QT_NOT_USED Q_UNREACHABLE(); // This will assert in debug.
 #endif
 
-#define Q_WEBENGINECORE_PRIVATE_EXPORT Q_WEBENGINECORE_EXPORT
-
 namespace QtWebEngineCore {
-Q_WEBENGINECORE_PRIVATE_EXPORT int processMain(int argc, const char **argv);
-Q_WEBENGINECORE_PRIVATE_EXPORT bool closingDown();
+Q_WEBENGINECORE_EXPORT int processMain(int argc, const char **argv);
+Q_WEBENGINECORE_EXPORT bool closingDown();
 } // namespace
 #if defined(Q_OS_WIN)
 namespace sandbox {
 struct SandboxInterfaceInfo;
 }
 namespace QtWebEngineSandbox {
-Q_WEBENGINECORE_PRIVATE_EXPORT sandbox::SandboxInterfaceInfo *staticSandboxInterfaceInfo(sandbox::SandboxInterfaceInfo *info = nullptr);
+Q_WEBENGINECORE_EXPORT sandbox::SandboxInterfaceInfo *staticSandboxInterfaceInfo(sandbox::SandboxInterfaceInfo *info = nullptr);
 void initializeStaticCopy(int argc, const char **argv);
 }
 #endif
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index ac9395301..51200436d 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -29,7 +29,7 @@ class CookieMonsterDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineCookieStorePrivate
 {
     Q_DECLARE_PUBLIC(QWebEngineCookieStore)
     struct CookieData {
diff --git a/src/core/api/qwebenginedownloadrequest_p.h b/src/core/api/qwebenginedownloadrequest_p.h
index 26afbc4ad..eef6c9bb5 100644
--- a/src/core/api/qwebenginedownloadrequest_p.h
+++ b/src/core/api/qwebenginedownloadrequest_p.h
@@ -28,7 +28,7 @@ class WebContentsAdapterClient;
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineDownloadRequestPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineDownloadRequestPrivate
 {
 public:
     QWebEngineDownloadRequestPrivate(QtWebEngineCore::ProfileAdapter *adapter);
diff --git a/src/core/api/qwebengineglobalsettings_p.h b/src/core/api/qwebengineglobalsettings_p.h
index 10ae502f0..8e35ad68c 100644
--- a/src/core/api/qwebengineglobalsettings_p.h
+++ b/src/core/api/qwebengineglobalsettings_p.h
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineGlobalSettingsPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineGlobalSettingsPrivate
 {
 public:
     QWebEngineGlobalSettingsPrivate()
diff --git a/src/core/api/qwebenginehistory_p.h b/src/core/api/qwebenginehistory_p.h
index 99c42d7eb..fe28f4a0e 100644
--- a/src/core/api/qwebenginehistory_p.h
+++ b/src/core/api/qwebenginehistory_p.h
@@ -72,7 +72,7 @@ public:
     int offsetForIndex(int) const override;
 };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineHistoryPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineHistoryPrivate
 {
 public:
     typedef std::function<QUrl (const QUrl &)> ImageProviderUrl;
diff --git a/src/core/api/qwebenginemessagepumpscheduler_p.h b/src/core/api/qwebenginemessagepumpscheduler_p.h
index 4ec7ef125..37f7dd9a6 100644
--- a/src/core/api/qwebenginemessagepumpscheduler_p.h
+++ b/src/core/api/qwebenginemessagepumpscheduler_p.h
@@ -23,7 +23,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineMessagePumpScheduler : public QObject
+class Q_WEBENGINECORE_EXPORT QWebEngineMessagePumpScheduler : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index 682fd8e89..eb6045da9 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -84,7 +84,7 @@ public:
     virtual void hideTouchSelectionMenu() = 0;
 };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
+class Q_WEBENGINECORE_EXPORT QWebEnginePagePrivate : public QtWebEngineCore::WebContentsAdapterClient
 {
 public:
     Q_DECLARE_PUBLIC(QWebEnginePage)
diff --git a/src/core/api/qwebengineprofile_p.h b/src/core/api/qwebengineprofile_p.h
index 377692f16..0ccc27037 100644
--- a/src/core/api/qwebengineprofile_p.h
+++ b/src/core/api/qwebengineprofile_p.h
@@ -37,7 +37,7 @@ class QWebEngineProfile;
 class QWebEngineScriptCollection;
 class QWebEngineSettings;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient {
+class Q_WEBENGINECORE_EXPORT QWebEngineProfilePrivate : public QtWebEngineCore::ProfileAdapterClient {
 public:
     Q_DECLARE_PUBLIC(QWebEngineProfile)
     QWebEngineProfilePrivate(QtWebEngineCore::ProfileAdapter *profileAdapter);
diff --git a/src/core/api/qwebenginescriptcollection_p.h b/src/core/api/qwebenginescriptcollection_p.h
index d675e128a..67b3aa4a7 100644
--- a/src/core/api/qwebenginescriptcollection_p.h
+++ b/src/core/api/qwebenginescriptcollection_p.h
@@ -27,7 +27,7 @@ class UserResourceControllerHost;
 } // namespace
 
 QT_BEGIN_NAMESPACE
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineScriptCollectionPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineScriptCollectionPrivate
 {
 public:
     QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserResourceControllerHost *, QSharedPointer<QtWebEngineCore::WebContentsAdapter> = QSharedPointer<QtWebEngineCore::WebContentsAdapter>());
diff --git a/src/core/api/qwebengineurlrequestinfo_p.h b/src/core/api/qwebengineurlrequestinfo_p.h
index 214e5a277..95cc72362 100644
--- a/src/core/api/qwebengineurlrequestinfo_p.h
+++ b/src/core/api/qwebengineurlrequestinfo_p.h
@@ -33,7 +33,7 @@ class ResourceRequestBody;
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineUrlRequestInfoPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInfoPrivate
 {
     Q_DECLARE_PUBLIC(QWebEngineUrlRequestInfo)
 public:
diff --git a/src/core/api/qwebenginewebauthuxrequest_p.h b/src/core/api/qwebenginewebauthuxrequest_p.h
index 45280bb0d..f82be1f44 100644
--- a/src/core/api/qwebenginewebauthuxrequest_p.h
+++ b/src/core/api/qwebenginewebauthuxrequest_p.h
@@ -26,7 +26,7 @@ class AuthenticatorRequestDialogController;
 
 QT_BEGIN_NAMESPACE
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineWebAuthUXRequestPrivate
+class Q_WEBENGINECORE_EXPORT QWebEngineWebAuthUXRequestPrivate
 {
 
 public:
diff --git a/src/core/authentication_dialog_controller.h b/src/core/authentication_dialog_controller.h
index ea8d9035e..944ec4d15 100644
--- a/src/core/authentication_dialog_controller.h
+++ b/src/core/authentication_dialog_controller.h
@@ -22,7 +22,7 @@ namespace QtWebEngineCore {
 
 class AuthenticationDialogControllerPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT AuthenticationDialogController : public QObject {
+class Q_WEBENGINECORE_EXPORT AuthenticationDialogController : public QObject {
     Q_OBJECT
 public:
     ~AuthenticationDialogController();
diff --git a/src/core/autofill_popup_controller.h b/src/core/autofill_popup_controller.h
index 586149b95..1b4d8d7e8 100644
--- a/src/core/autofill_popup_controller.h
+++ b/src/core/autofill_popup_controller.h
@@ -15,7 +15,7 @@ namespace QtWebEngineCore {
 
 class AutofillPopupControllerPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT AutofillPopupController : public QObject
+class Q_WEBENGINECORE_EXPORT AutofillPopupController : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QStringListModel *model READ model CONSTANT FINAL)
diff --git a/src/core/certificate_error_controller.h b/src/core/certificate_error_controller.h
index 4fb1a3c77..cbcb60f8a 100644
--- a/src/core/certificate_error_controller.h
+++ b/src/core/certificate_error_controller.h
@@ -33,7 +33,7 @@ class GURL;
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT CertificateErrorController {
+class Q_WEBENGINECORE_EXPORT CertificateErrorController {
 public:
     CertificateErrorController(
             int cert_error, const net::SSLInfo &ssl_info, const GURL &request_url,
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h
index 4807f11f1..8380a7845 100644
--- a/src/core/client_cert_select_controller.h
+++ b/src/core/client_cert_select_controller.h
@@ -34,7 +34,7 @@ class SSLCertRequestInfo;
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT ClientCertSelectController {
+class Q_WEBENGINECORE_EXPORT ClientCertSelectController {
 public:
     ClientCertSelectController(net::SSLCertRequestInfo *certRequestInfo,
                                std::vector<std::unique_ptr<net::ClientCertIdentity>> clientCerts,
diff --git a/src/core/color_chooser_controller.h b/src/core/color_chooser_controller.h
index 7eafc143a..a97ebfbff 100644
--- a/src/core/color_chooser_controller.h
+++ b/src/core/color_chooser_controller.h
@@ -25,7 +25,7 @@ namespace QtWebEngineCore {
 
 class ColorChooserControllerPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT ColorChooserController : public QObject {
+class Q_WEBENGINECORE_EXPORT ColorChooserController : public QObject {
     Q_OBJECT
 public:
     ~ColorChooserController();
diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h
index 684086b7b..501559060 100644
--- a/src/core/compositor/compositor.h
+++ b/src/core/compositor/compositor.h
@@ -22,7 +22,7 @@ namespace QtWebEngineCore {
 //
 // Used by quick/widgets libraries for accessing the frames and
 // controlling frame swapping.
-class Q_WEBENGINECORE_PRIVATE_EXPORT Compositor
+class Q_WEBENGINECORE_EXPORT Compositor
 {
     struct Binding;
 
@@ -75,7 +75,7 @@ public:
     // Observes the compositor corresponding to the given id.
     //
     // Only one observer can exist per compositor.
-    class Q_WEBENGINECORE_PRIVATE_EXPORT Observer
+    class Q_WEBENGINECORE_EXPORT Observer
     {
     public:
         // Binding to compositor
diff --git a/src/core/desktop_media_controller.h b/src/core/desktop_media_controller.h
index 12d95adf6..0cb741225 100644
--- a/src/core/desktop_media_controller.h
+++ b/src/core/desktop_media_controller.h
@@ -15,7 +15,7 @@ class DesktopMediaControllerPrivate;
 
 enum DesktopMediaType { Screen = 0, Window };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT DesktopMediaListQt : public QObject
+class Q_WEBENGINECORE_EXPORT DesktopMediaListQt : public QObject
 {
     Q_OBJECT
 public:
@@ -40,7 +40,7 @@ private:
     std::unique_ptr<DesktopMediaListQtPrivate> d;
 };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT DesktopMediaController : public QObject
+class Q_WEBENGINECORE_EXPORT DesktopMediaController : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/desktop_media_controller_p.h b/src/core/desktop_media_controller_p.h
index b20531fd5..4bb3a6312 100644
--- a/src/core/desktop_media_controller_p.h
+++ b/src/core/desktop_media_controller_p.h
@@ -11,7 +11,7 @@
 #include "base/functional/callback.h"
 
 namespace QtWebEngineCore {
-class Q_WEBENGINECORE_PRIVATE_EXPORT DesktopMediaControllerPrivate
+class Q_WEBENGINECORE_EXPORT DesktopMediaControllerPrivate
 {
 public:
     DesktopMediaControllerPrivate(base::OnceCallback<void(content::DesktopMediaID)> doneCallback);
diff --git a/src/core/file_picker_controller.h b/src/core/file_picker_controller.h
index 82c72a9e6..42ffd6a2d 100644
--- a/src/core/file_picker_controller.h
+++ b/src/core/file_picker_controller.h
@@ -22,7 +22,7 @@
 namespace QtWebEngineCore {
 
 class FilePickerControllerPrivate;
-class Q_WEBENGINECORE_PRIVATE_EXPORT FilePickerController : public QObject {
+class Q_WEBENGINECORE_EXPORT FilePickerController : public QObject {
     Q_OBJECT
 public:
     enum FileChooserMode {
diff --git a/src/core/find_text_helper.h b/src/core/find_text_helper.h
index 38a0b9d13..6d2e48b63 100644
--- a/src/core/find_text_helper.h
+++ b/src/core/find_text_helper.h
@@ -37,7 +37,7 @@ namespace QtWebEngineCore {
 
 class WebContentsAdapterClient;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT FindTextHelper {
+class Q_WEBENGINECORE_EXPORT FindTextHelper {
 public:
     FindTextHelper(content::WebContents *webContents, WebContentsAdapterClient *viewClient);
     ~FindTextHelper();
diff --git a/src/core/javascript_dialog_controller.h b/src/core/javascript_dialog_controller.h
index 5845c156c..6c1ee269f 100644
--- a/src/core/javascript_dialog_controller.h
+++ b/src/core/javascript_dialog_controller.h
@@ -23,7 +23,7 @@ namespace QtWebEngineCore {
 
 class JavaScriptDialogControllerPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT JavaScriptDialogController : public QObject {
+class Q_WEBENGINECORE_EXPORT JavaScriptDialogController : public QObject {
     Q_OBJECT
 public:
     ~JavaScriptDialogController();
diff --git a/src/core/net/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h
index 4273e96ef..f6872323d 100644
--- a/src/core/net/cookie_monster_delegate_qt.h
+++ b/src/core/net/cookie_monster_delegate_qt.h
@@ -42,7 +42,7 @@ namespace QtWebEngineCore {
 
 class CookieMonsterDelegateQtPrivate;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt>
+class Q_WEBENGINECORE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt>
 {
     QPointer<QWebEngineCookieStore> m_client;
     std::vector<std::unique_ptr<net::CookieChangeSubscription>> m_subscriptions;
diff --git a/src/core/net/resource_request_body_qt.h b/src/core/net/resource_request_body_qt.h
index aa3af2d28..717885d7d 100644
--- a/src/core/net/resource_request_body_qt.h
+++ b/src/core/net/resource_request_body_qt.h
@@ -31,7 +31,7 @@ class DataPipeConsumerHandle;
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT ResourceRequestBody : public QIODevice
+class Q_WEBENGINECORE_EXPORT ResourceRequestBody : public QIODevice
 {
     Q_OBJECT
 public:
diff --git a/src/core/net/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h
index efb516dc8..63db46464 100644
--- a/src/core/net/url_request_custom_job_delegate.h
+++ b/src/core/net/url_request_custom_job_delegate.h
@@ -33,7 +33,7 @@ namespace QtWebEngineCore {
 
 class URLRequestCustomJobProxy;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT URLRequestCustomJobDelegate : public QObject
+class Q_WEBENGINECORE_EXPORT URLRequestCustomJobDelegate : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/printing/pdfium_document_wrapper_qt.h b/src/core/printing/pdfium_document_wrapper_qt.h
index 727818a90..feb34e36a 100644
--- a/src/core/printing/pdfium_document_wrapper_qt.h
+++ b/src/core/printing/pdfium_document_wrapper_qt.h
@@ -21,7 +21,7 @@
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT PdfiumDocumentWrapperQt
+class Q_WEBENGINECORE_EXPORT PdfiumDocumentWrapperQt
 {
 public:
     PdfiumDocumentWrapperQt(const void *pdfData, size_t size, const char *password = nullptr);
diff --git a/src/core/printing/printer_worker.h b/src/core/printing/printer_worker.h
index b3ac07ad4..0d2454fa0 100644
--- a/src/core/printing/printer_worker.h
+++ b/src/core/printing/printer_worker.h
@@ -26,7 +26,7 @@ QT_END_NAMESPACE
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT PrinterWorker : public QObject
+class Q_WEBENGINECORE_EXPORT PrinterWorker : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index c778a140d..eab910d1d 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -46,7 +46,7 @@ class UserResourceControllerHost;
 class VisitedLinksManagerQt;
 class WebContentsAdapterClient;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT ProfileAdapter : public QObject
+class Q_WEBENGINECORE_EXPORT ProfileAdapter : public QObject
 {
 public:
     explicit ProfileAdapter(const QString &storagePrefix = QString());
diff --git a/src/core/profile_adapter_client.h b/src/core/profile_adapter_client.h
index 5f465800b..06ac0de8b 100644
--- a/src/core/profile_adapter_client.h
+++ b/src/core/profile_adapter_client.h
@@ -27,7 +27,7 @@ class WebContentsAdapterClient;
 class WebEngineSettings;
 class UserNotificationController;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT ProfileAdapterClient
+class Q_WEBENGINECORE_EXPORT ProfileAdapterClient
 {
 public:
     // Keep in sync with content::DownloadItem::DownloadState
diff --git a/src/core/render_view_context_menu_qt.h b/src/core/render_view_context_menu_qt.h
index b7f6744cd..71901424c 100644
--- a/src/core/render_view_context_menu_qt.h
+++ b/src/core/render_view_context_menu_qt.h
@@ -21,7 +21,7 @@ QT_FORWARD_DECLARE_CLASS(QWebEngineContextMenuRequest)
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT RenderViewContextMenuQt
+class Q_WEBENGINECORE_EXPORT RenderViewContextMenuQt
 {
 public:
     enum ContextMenuItem {
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
index 649fda77b..b1f33db7a 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -29,7 +29,7 @@ QT_END_NAMESPACE
 namespace QtWebEngineCore {
 
 class WebContentsAdapterClient;
-class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegate {
+class Q_WEBENGINECORE_EXPORT RenderWidgetHostViewQtDelegate {
 public:
     virtual ~RenderWidgetHostViewQtDelegate() { }
     virtual void initAsPopup(const QRect&) = 0;
diff --git a/src/core/render_widget_host_view_qt_delegate_client.h b/src/core/render_widget_host_view_qt_delegate_client.h
index 0616dbc96..57354f549 100644
--- a/src/core/render_widget_host_view_qt_delegate_client.h
+++ b/src/core/render_widget_host_view_qt_delegate_client.h
@@ -46,7 +46,7 @@ struct MultipleMouseClickHelper
     ulong lastPressTimestamp = 0;
 };
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateClient
+class Q_WEBENGINECORE_EXPORT RenderWidgetHostViewQtDelegateClient
 {
 public:
     RenderWidgetHostViewQtDelegateClient(RenderWidgetHostViewQt *rwhv);
diff --git a/src/core/render_widget_host_view_qt_delegate_item.h b/src/core/render_widget_host_view_qt_delegate_item.h
index 55f243eab..0da6b4948 100644
--- a/src/core/render_widget_host_view_qt_delegate_item.h
+++ b/src/core/render_widget_host_view_qt_delegate_item.h
@@ -44,7 +44,7 @@ public:
 // but will still receive mouse input (all mouse QEvent moves and clicks will be given to the popup
 // RWHVQD instance, and the mouse interaction area covers the surface of the whole parent
 // QWebEngineView, and not only the smaller surface that an HTML select popup would occupy).
-class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateItem
+class Q_WEBENGINECORE_EXPORT RenderWidgetHostViewQtDelegateItem
         : public QQuickItem
         , public RenderWidgetHostViewQtDelegate
         , public Compositor::Observer
diff --git a/src/core/renderer_host/user_resource_controller_host.h b/src/core/renderer_host/user_resource_controller_host.h
index e92deb900..eb4404879 100644
--- a/src/core/renderer_host/user_resource_controller_host.h
+++ b/src/core/renderer_host/user_resource_controller_host.h
@@ -47,7 +47,7 @@ using UserResourceControllerRemote = mojo::AssociatedRemote<qtwebengine::mojom::
 using UserResourceControllerRenderFrameRemote = mojo::AssociatedRemote<qtwebengine::mojom::UserResourceControllerRenderFrame>;
 class WebContentsAdapter;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT UserResourceControllerHost
+class Q_WEBENGINECORE_EXPORT UserResourceControllerHost
 {
 
 public:
diff --git a/src/core/touch_handle_drawable_client.h b/src/core/touch_handle_drawable_client.h
index 3e1812a35..ddfaa9f57 100644
--- a/src/core/touch_handle_drawable_client.h
+++ b/src/core/touch_handle_drawable_client.h
@@ -9,7 +9,7 @@
 
 namespace QtWebEngineCore {
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT TouchHandleDrawableDelegate {
+class Q_WEBENGINECORE_EXPORT TouchHandleDrawableDelegate {
 public:
     virtual ~TouchHandleDrawableDelegate() { }
 
diff --git a/src/core/touch_selection_menu_controller.h b/src/core/touch_selection_menu_controller.h
index 184ac039b..6a1fc1960 100644
--- a/src/core/touch_selection_menu_controller.h
+++ b/src/core/touch_selection_menu_controller.h
@@ -11,7 +11,7 @@ namespace QtWebEngineCore {
 
 class TouchSelectionControllerClientQt;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT TouchSelectionMenuController : public QObject {
+class Q_WEBENGINECORE_EXPORT TouchSelectionMenuController : public QObject {
     Q_OBJECT
 public:
     enum TouchSelectionCommandFlag {
diff --git a/src/core/visited_links_manager_qt.h b/src/core/visited_links_manager_qt.h
index eff124bfd..7bcf32d52 100644
--- a/src/core/visited_links_manager_qt.h
+++ b/src/core/visited_links_manager_qt.h
@@ -32,7 +32,7 @@ namespace QtWebEngineCore {
 class ProfileQt;
 class VisitedLinkDelegateQt;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT VisitedLinksManagerQt {
+class Q_WEBENGINECORE_EXPORT VisitedLinksManagerQt {
 
 public:
     virtual~VisitedLinksManagerQt();
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index 807806973..62c3f087c 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -60,7 +60,7 @@ class ProfileQt;
 class WebEnginePageHost;
 class WebChannelIPCTransportHost;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> {
+class Q_WEBENGINECORE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> {
 public:
     static QSharedPointer<WebContentsAdapter> createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient);
     WebContentsAdapter();
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 7d3dcff51..7ab3d7b93 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -61,7 +61,7 @@ class WebContentsAdapter;
 class WebContentsDelegateQt;
 class WebEngineSettings;
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT WebContentsAdapterClient {
+class Q_WEBENGINECORE_EXPORT WebContentsAdapterClient {
 public:
     // This must match window_open_disposition_list.h.
     enum WindowOpenDisposition {
diff --git a/src/core/web_engine_error.h b/src/core/web_engine_error.h
index 88766f9c0..b43678ad2 100644
--- a/src/core/web_engine_error.h
+++ b/src/core/web_engine_error.h
@@ -17,7 +17,7 @@
 
 #include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h>
 
-class Q_WEBENGINECORE_PRIVATE_EXPORT WebEngineError
+class Q_WEBENGINECORE_EXPORT WebEngineError
 {
 
 public: