From 225eb501768c2f4a12683c116281246a52eb568c Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 28 Mar 2019 15:45:44 +0100
Subject: Switch export macros to standard form

Qt expects the export macros to have Q_ prefixes, otherwise the symbol
versioning script won't find them and mark them.

Task-number: QTBUG-74752
Change-Id: I1e057802f6715d170bdd9074f281e73fb96c9e52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/core/api/qtwebenginecoreglobal.cpp                  | 2 +-
 src/core/api/qtwebenginecoreglobal.h                    | 4 ++--
 src/core/api/qtwebenginecoreglobal_p.h                  | 2 +-
 src/core/api/qwebengineclientcertificatestore.h         | 2 +-
 src/core/api/qwebenginecookiestore.h                    | 2 +-
 src/core/api/qwebenginecookiestore_p.h                  | 2 +-
 src/core/api/qwebenginehttprequest.h                    | 2 +-
 src/core/api/qwebenginemessagepumpscheduler_p.h         | 2 +-
 src/core/api/qwebenginenotification.h                   | 2 +-
 src/core/api/qwebenginequotarequest.h                   | 2 +-
 src/core/api/qwebengineregisterprotocolhandlerrequest.h | 2 +-
 src/core/api/qwebengineurlrequestinfo.h                 | 2 +-
 src/core/api/qwebengineurlrequestinterceptor.h          | 2 +-
 src/core/api/qwebengineurlrequestjob.h                  | 2 +-
 src/core/api/qwebengineurlscheme.h                      | 2 +-
 src/core/api/qwebengineurlschemehandler.h               | 2 +-
 src/core/authentication_dialog_controller.h             | 2 +-
 src/core/certificate_error_controller.h                 | 2 +-
 src/core/client_cert_select_controller.h                | 2 +-
 src/core/color_chooser_controller.h                     | 2 +-
 src/core/favicon_manager.h                              | 4 ++--
 src/core/file_picker_controller.h                       | 2 +-
 src/core/javascript_dialog_controller.h                 | 2 +-
 src/core/net/cookie_monster_delegate_qt.h               | 2 +-
 src/core/net/custom_protocol_handler.h                  | 2 +-
 src/core/net/url_request_custom_job_delegate.h          | 2 +-
 src/core/printing/pdfium_document_wrapper_qt.cpp        | 2 +-
 src/core/printing/pdfium_document_wrapper_qt.h          | 2 +-
 src/core/process_main.h                                 | 2 +-
 src/core/profile_adapter.h                              | 2 +-
 src/core/profile_adapter_client.h                       | 2 +-
 src/core/render_view_context_menu_qt.h                  | 2 +-
 src/core/render_widget_host_view_qt_delegate.h          | 4 ++--
 src/core/renderer_host/user_resource_controller_host.h  | 2 +-
 src/core/touch_handle_drawable_client.h                 | 2 +-
 src/core/touch_selection_menu_controller.h              | 2 +-
 src/core/user_notification_controller.h                 | 2 +-
 src/core/user_script.h                                  | 2 +-
 src/core/visited_links_manager_qt.h                     | 2 +-
 src/core/web_contents_adapter.h                         | 2 +-
 src/core/web_contents_adapter_client.h                  | 2 +-
 src/core/web_engine_error.h                             | 2 +-
 src/core/web_engine_settings.h                          | 2 +-
 43 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index a415ade92..d857d4f12 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -89,7 +89,7 @@ static void deleteShareContext()
 // after the QGuiApplication creation, when AA_ShareOpenGLContexts fills
 // the same need but the flag has to be set earlier.
 
-QWEBENGINECORE_PRIVATE_EXPORT void initialize()
+Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
 {
 #ifndef QT_NO_OPENGL
 #ifdef Q_OS_WIN32
diff --git a/src/core/api/qtwebenginecoreglobal.h b/src/core/api/qtwebenginecoreglobal.h
index bcff622b7..c425d1478 100644
--- a/src/core/api/qtwebenginecoreglobal.h
+++ b/src/core/api/qtwebenginecoreglobal.h
@@ -46,9 +46,9 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(BUILDING_CHROMIUM)
-#  define QWEBENGINECORE_EXPORT Q_DECL_EXPORT
+#  define Q_WEBENGINECORE_EXPORT Q_DECL_EXPORT
 #else
-#  define QWEBENGINECORE_EXPORT Q_DECL_IMPORT
+#  define Q_WEBENGINECORE_EXPORT Q_DECL_IMPORT
 #endif
 
 #define ASSERT_ENUMS_MATCH(A, B) Q_STATIC_ASSERT_X(static_cast<int>(A) == static_cast<int>(B), "The enum values must match");
diff --git a/src/core/api/qtwebenginecoreglobal_p.h b/src/core/api/qtwebenginecoreglobal_p.h
index 27bf2d9f9..655b2a814 100644
--- a/src/core/api/qtwebenginecoreglobal_p.h
+++ b/src/core/api/qtwebenginecoreglobal_p.h
@@ -63,6 +63,6 @@
 #define QT_NOT_USED Q_UNREACHABLE(); // This will assert in debug.
 #endif
 
-#define QWEBENGINECORE_PRIVATE_EXPORT QWEBENGINECORE_EXPORT
+#define Q_WEBENGINECORE_PRIVATE_EXPORT Q_WEBENGINECORE_EXPORT
 
 #endif // QTWEBENGINECOREGLOBAL_P_H
diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h
index d9a1a0545..68705e80b 100644
--- a/src/core/api/qwebengineclientcertificatestore.h
+++ b/src/core/api/qwebengineclientcertificatestore.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 #if QT_CONFIG(ssl)
 
-class QWEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
+class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
 
 public:
     void add(const QSslCertificate &certificate, const QSslKey &privateKey);
diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h
index 89e72dfb0..36bb64ccf 100644
--- a/src/core/api/qwebenginecookiestore.h
+++ b/src/core/api/qwebenginecookiestore.h
@@ -57,7 +57,7 @@ class CookieMonsterDelegateQt;
 QT_BEGIN_NAMESPACE
 
 class QWebEngineCookieStorePrivate;
-class QWEBENGINECORE_EXPORT QWebEngineCookieStore : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineCookieStore : public QObject {
     Q_OBJECT
 
 public:
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index 93198d8ed..3df0e3590 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -66,7 +66,7 @@ class CookieMonsterDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate
 {
     Q_DECLARE_PUBLIC(QWebEngineCookieStore)
     struct CookieData {
diff --git a/src/core/api/qwebenginehttprequest.h b/src/core/api/qwebenginehttprequest.h
index c6b5a6b63..8735dfb8e 100644
--- a/src/core/api/qwebenginehttprequest.h
+++ b/src/core/api/qwebenginehttprequest.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineHttpRequestPrivate;
 
-class QWEBENGINECORE_EXPORT QWebEngineHttpRequest
+class Q_WEBENGINECORE_EXPORT QWebEngineHttpRequest
 {
 public:
     enum Method {
diff --git a/src/core/api/qwebenginemessagepumpscheduler_p.h b/src/core/api/qwebenginemessagepumpscheduler_p.h
index 4c9e4d600..46ed62f54 100644
--- a/src/core/api/qwebenginemessagepumpscheduler_p.h
+++ b/src/core/api/qwebenginemessagepumpscheduler_p.h
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_PRIVATE_EXPORT QWebEngineMessagePumpScheduler : public QObject
+class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineMessagePumpScheduler : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/core/api/qwebenginenotification.h b/src/core/api/qwebenginenotification.h
index 0012e5d78..6c9a8f891 100644
--- a/src/core/api/qwebenginenotification.h
+++ b/src/core/api/qwebenginenotification.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineNotificationPrivate;
 
-class QWEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineNotification : public QObject {
     Q_OBJECT
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(QIcon icon READ icon CONSTANT FINAL)
diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h
index a759f5bb6..1f6333b3b 100644
--- a/src/core/api/qwebenginequotarequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -51,7 +51,7 @@ class QuotaRequestController;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_EXPORT QWebEngineQuotaRequest {
+class Q_WEBENGINECORE_EXPORT QWebEngineQuotaRequest {
     Q_GADGET
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL)
diff --git a/src/core/api/qwebengineregisterprotocolhandlerrequest.h b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
index 12b1d6edf..281e81e73 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerrequest.h
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
@@ -51,7 +51,7 @@ class WebContentsDelegateQt;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_EXPORT QWebEngineRegisterProtocolHandlerRequest {
+class Q_WEBENGINECORE_EXPORT QWebEngineRegisterProtocolHandlerRequest {
     Q_GADGET
     Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
     Q_PROPERTY(QString scheme READ scheme CONSTANT FINAL)
diff --git a/src/core/api/qwebengineurlrequestinfo.h b/src/core/api/qwebengineurlrequestinfo.h
index e1f9ca6ef..f37693cda 100644
--- a/src/core/api/qwebengineurlrequestinfo.h
+++ b/src/core/api/qwebengineurlrequestinfo.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineUrlRequestInfoPrivate;
 
-class QWEBENGINECORE_EXPORT QWebEngineUrlRequestInfo {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInfo {
 public:
     enum ResourceType {
         ResourceTypeMainFrame = 0,  // top level page
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index 2b07681ca..027486b40 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index b2dd8baa3..dee09b6e1 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QIODevice;
 
-class QWEBENGINECORE_EXPORT QWebEngineUrlRequestJob : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestJob : public QObject {
     Q_OBJECT
 public:
     ~QWebEngineUrlRequestJob();
diff --git a/src/core/api/qwebengineurlscheme.h b/src/core/api/qwebengineurlscheme.h
index da3010335..f3ceb0596 100644
--- a/src/core/api/qwebengineurlscheme.h
+++ b/src/core/api/qwebengineurlscheme.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineUrlSchemePrivate;
 
-class QWEBENGINECORE_EXPORT QWebEngineUrlScheme {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlScheme {
     Q_GADGET
 public:
     enum class Syntax {
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index 549778561..be80241f1 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 class QWebEngineUrlRequestJob;
 
-class QWEBENGINECORE_EXPORT QWebEngineUrlSchemeHandler : public QObject {
+class Q_WEBENGINECORE_EXPORT QWebEngineUrlSchemeHandler : public QObject {
     Q_OBJECT
 public:
     QWebEngineUrlSchemeHandler(QObject *parent = Q_NULLPTR);
diff --git a/src/core/authentication_dialog_controller.h b/src/core/authentication_dialog_controller.h
index aec91aac5..631a95c34 100644
--- a/src/core/authentication_dialog_controller.h
+++ b/src/core/authentication_dialog_controller.h
@@ -59,7 +59,7 @@ namespace QtWebEngineCore {
 
 class AuthenticationDialogControllerPrivate;
 
-class QWEBENGINECORE_PRIVATE_EXPORT AuthenticationDialogController : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT AuthenticationDialogController : public QObject {
     Q_OBJECT
 public:
     ~AuthenticationDialogController();
diff --git a/src/core/certificate_error_controller.h b/src/core/certificate_error_controller.h
index 6e1e87cb0..5bea61c9b 100644
--- a/src/core/certificate_error_controller.h
+++ b/src/core/certificate_error_controller.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class CertificateErrorControllerPrivate;
 
-class QWEBENGINECORE_PRIVATE_EXPORT CertificateErrorController {
+class Q_WEBENGINECORE_PRIVATE_EXPORT CertificateErrorController {
 public:
     CertificateErrorController(CertificateErrorControllerPrivate *p);
     ~CertificateErrorController();
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h
index 8f4f78d94..f121c1155 100644
--- a/src/core/client_cert_select_controller.h
+++ b/src/core/client_cert_select_controller.h
@@ -72,7 +72,7 @@ class SSLCertRequestInfo;
 
 QT_BEGIN_NAMESPACE
 
-class QWEBENGINECORE_PRIVATE_EXPORT ClientCertSelectController {
+class Q_WEBENGINECORE_PRIVATE_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 e5daa09a8..66222bb77 100644
--- a/src/core/color_chooser_controller.h
+++ b/src/core/color_chooser_controller.h
@@ -62,7 +62,7 @@ namespace QtWebEngineCore {
 
 class ColorChooserControllerPrivate;
 
-class QWEBENGINECORE_PRIVATE_EXPORT ColorChooserController : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT ColorChooserController : public QObject {
     Q_OBJECT
 public:
     ~ColorChooserController();
diff --git a/src/core/favicon_manager.h b/src/core/favicon_manager.h
index 60d194c4b..75d6aa75b 100644
--- a/src/core/favicon_manager.h
+++ b/src/core/favicon_manager.h
@@ -82,7 +82,7 @@ namespace QtWebEngineCore {
 class WebContentsAdapterClient;
 
 // Based on src/3rdparty/chromium/content/public/common/favicon_url.h
-class QWEBENGINECORE_PRIVATE_EXPORT FaviconInfo {
+class Q_WEBENGINECORE_PRIVATE_EXPORT FaviconInfo {
 public:
     enum FaviconTypeFlag {
         InvalidIcon = 0,
@@ -109,7 +109,7 @@ public:
 };
 
 
-class QWEBENGINECORE_PRIVATE_EXPORT FaviconManager {
+class Q_WEBENGINECORE_PRIVATE_EXPORT FaviconManager {
 
 public:
     FaviconManager(content::WebContents *, WebContentsAdapterClient *);
diff --git a/src/core/file_picker_controller.h b/src/core/file_picker_controller.h
index 613d3ad9b..dc8c0eddf 100644
--- a/src/core/file_picker_controller.h
+++ b/src/core/file_picker_controller.h
@@ -64,7 +64,7 @@ namespace content {
 
 namespace QtWebEngineCore {
 
-class QWEBENGINECORE_PRIVATE_EXPORT FilePickerController : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT FilePickerController : public QObject {
     Q_OBJECT
 public:
     enum FileChooserMode {
diff --git a/src/core/javascript_dialog_controller.h b/src/core/javascript_dialog_controller.h
index 1ba94e095..ba9f51944 100644
--- a/src/core/javascript_dialog_controller.h
+++ b/src/core/javascript_dialog_controller.h
@@ -59,7 +59,7 @@ namespace QtWebEngineCore {
 
 class JavaScriptDialogControllerPrivate;
 
-class QWEBENGINECORE_PRIVATE_EXPORT JavaScriptDialogController : public QObject {
+class Q_WEBENGINECORE_PRIVATE_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 7933ba329..88e92b560 100644
--- a/src/core/net/cookie_monster_delegate_qt.h
+++ b/src/core/net/cookie_monster_delegate_qt.h
@@ -75,7 +75,7 @@ namespace QtWebEngineCore {
 static const char* const kCookieableSchemes[] =
     { "http", "https", "qrc", "ws", "wss" };
 
-class QWEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt> {
+class Q_WEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt> {
     QPointer<QWebEngineCookieStore> m_client;
     net::CookieMonster *m_cookieMonster;
     std::vector<std::unique_ptr<net::CookieChangeSubscription>> m_subscriptions;
diff --git a/src/core/net/custom_protocol_handler.h b/src/core/net/custom_protocol_handler.h
index d5b512b03..7b189763c 100644
--- a/src/core/net/custom_protocol_handler.h
+++ b/src/core/net/custom_protocol_handler.h
@@ -71,7 +71,7 @@ class ProfileAdapter;
 
 // Implements a ProtocolHandler for custom URL schemes.
 // If |network_delegate_| is NULL then all file requests will fail with ERR_ACCESS_DENIED.
-class QWEBENGINECORE_PRIVATE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
+class Q_WEBENGINECORE_PRIVATE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 
 public:
     CustomProtocolHandler(QPointer<ProfileAdapter> profileAdapter);
diff --git a/src/core/net/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h
index 1bf3ade1f..0ab1a82c7 100644
--- a/src/core/net/url_request_custom_job_delegate.h
+++ b/src/core/net/url_request_custom_job_delegate.h
@@ -64,7 +64,7 @@ namespace QtWebEngineCore {
 
 class URLRequestCustomJobProxy;
 
-class QWEBENGINECORE_PRIVATE_EXPORT URLRequestCustomJobDelegate : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT URLRequestCustomJobDelegate : public QObject {
     Q_OBJECT
 public:
     ~URLRequestCustomJobDelegate();
diff --git a/src/core/printing/pdfium_document_wrapper_qt.cpp b/src/core/printing/pdfium_document_wrapper_qt.cpp
index 6dbdf64ef..1be27f1c6 100644
--- a/src/core/printing/pdfium_document_wrapper_qt.cpp
+++ b/src/core/printing/pdfium_document_wrapper_qt.cpp
@@ -48,7 +48,7 @@
 namespace QtWebEngineCore {
 int PdfiumDocumentWrapperQt::m_libraryUsers = 0;
 
-class QWEBENGINECORE_PRIVATE_EXPORT PdfiumPageWrapperQt {
+class PdfiumPageWrapperQt {
 public:
     PdfiumPageWrapperQt(FPDF_DOCUMENT data, int pageIndex, int targetWidth, int targetHeight)
         : m_pageData(FPDF_LoadPage(data, pageIndex))
diff --git a/src/core/printing/pdfium_document_wrapper_qt.h b/src/core/printing/pdfium_document_wrapper_qt.h
index f4ac557a0..2dab268fc 100644
--- a/src/core/printing/pdfium_document_wrapper_qt.h
+++ b/src/core/printing/pdfium_document_wrapper_qt.h
@@ -58,7 +58,7 @@
 namespace QtWebEngineCore {
 class PdfiumPageWrapperQt;
 
-class QWEBENGINECORE_PRIVATE_EXPORT PdfiumDocumentWrapperQt
+class Q_WEBENGINECORE_PRIVATE_EXPORT PdfiumDocumentWrapperQt
 {
 public:
     PdfiumDocumentWrapperQt(const void *pdfData, size_t size, const QSize &imageSize,
diff --git a/src/core/process_main.h b/src/core/process_main.h
index d171828d5..00c029d9f 100644
--- a/src/core/process_main.h
+++ b/src/core/process_main.h
@@ -52,6 +52,6 @@
 
 namespace QtWebEngine {
 
-QWEBENGINECORE_PRIVATE_EXPORT int processMain(int argc, const char **argv);
+Q_WEBENGINECORE_PRIVATE_EXPORT int processMain(int argc, const char **argv);
 
 } // namespace
diff --git a/src/core/profile_adapter.h b/src/core/profile_adapter.h
index 48094a3d8..1f94f59a9 100644
--- a/src/core/profile_adapter.h
+++ b/src/core/profile_adapter.h
@@ -78,7 +78,7 @@ class UserResourceControllerHost;
 class VisitedLinksManagerQt;
 class WebContentsAdapterClient;
 
-class QWEBENGINECORE_PRIVATE_EXPORT ProfileAdapter : public QObject
+class Q_WEBENGINECORE_PRIVATE_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 8ee9d240e..b463043da 100644
--- a/src/core/profile_adapter_client.h
+++ b/src/core/profile_adapter_client.h
@@ -61,7 +61,7 @@ namespace QtWebEngineCore {
 class WebContentsAdapterClient;
 class UserNotificationController;
 
-class QWEBENGINECORE_PRIVATE_EXPORT ProfileAdapterClient
+class Q_WEBENGINECORE_PRIVATE_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 d8ca2775c..e1ee301fc 100644
--- a/src/core/render_view_context_menu_qt.h
+++ b/src/core/render_view_context_menu_qt.h
@@ -55,7 +55,7 @@
 
 namespace QtWebEngineCore {
 
-class QWEBENGINECORE_PRIVATE_EXPORT RenderViewContextMenuQt
+class Q_WEBENGINECORE_PRIVATE_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 e2c98360d..cbf92a8d4 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -74,7 +74,7 @@ namespace QtWebEngineCore {
 
 class WebContentsAdapterClient;
 
-class QWEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateClient {
+class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateClient {
 public:
     virtual ~RenderWidgetHostViewQtDelegateClient() { }
     virtual QSGNode *updatePaintNode(QSGNode *) = 0;
@@ -86,7 +86,7 @@ public:
     virtual void closePopup() = 0;
 };
 
-class QWEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegate {
+class Q_WEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegate {
 public:
     virtual ~RenderWidgetHostViewQtDelegate() { }
     virtual void initAsPopup(const QRect&) = 0;
diff --git a/src/core/renderer_host/user_resource_controller_host.h b/src/core/renderer_host/user_resource_controller_host.h
index 40b685163..16a73f5fb 100644
--- a/src/core/renderer_host/user_resource_controller_host.h
+++ b/src/core/renderer_host/user_resource_controller_host.h
@@ -66,7 +66,7 @@ namespace QtWebEngineCore {
 
 class WebContentsAdapter;
 
-class QWEBENGINECORE_PRIVATE_EXPORT UserResourceControllerHost {
+class Q_WEBENGINECORE_PRIVATE_EXPORT UserResourceControllerHost {
 
 public:
     UserResourceControllerHost();
diff --git a/src/core/touch_handle_drawable_client.h b/src/core/touch_handle_drawable_client.h
index 42d907d75..a2c87948a 100644
--- a/src/core/touch_handle_drawable_client.h
+++ b/src/core/touch_handle_drawable_client.h
@@ -45,7 +45,7 @@
 
 namespace QtWebEngineCore {
 
-class QWEBENGINECORE_PRIVATE_EXPORT TouchHandleDrawableClient {
+class Q_WEBENGINECORE_PRIVATE_EXPORT TouchHandleDrawableClient {
 public:
     virtual ~TouchHandleDrawableClient() { }
 
diff --git a/src/core/touch_selection_menu_controller.h b/src/core/touch_selection_menu_controller.h
index fd61ae709..34137b05b 100644
--- a/src/core/touch_selection_menu_controller.h
+++ b/src/core/touch_selection_menu_controller.h
@@ -47,7 +47,7 @@ namespace QtWebEngineCore {
 
 class TouchSelectionControllerClientQt;
 
-class QWEBENGINECORE_PRIVATE_EXPORT TouchSelectionMenuController : public QObject {
+class Q_WEBENGINECORE_PRIVATE_EXPORT TouchSelectionMenuController : public QObject {
     Q_OBJECT
 public:
     enum TouchSelectionCommand {
diff --git a/src/core/user_notification_controller.h b/src/core/user_notification_controller.h
index 840074843..213629334 100644
--- a/src/core/user_notification_controller.h
+++ b/src/core/user_notification_controller.h
@@ -58,7 +58,7 @@ namespace QtWebEngineCore {
 class UserNotificationControllerPrivate;
 
 // Works as an accessor and owner of chromium objects related to showing desktop notifications.
-class QWEBENGINECORE_EXPORT UserNotificationController : public QEnableSharedFromThis<UserNotificationController> {
+class Q_WEBENGINECORE_EXPORT UserNotificationController : public QEnableSharedFromThis<UserNotificationController> {
 public:
     struct Delegate {
         virtual ~Delegate() { }
diff --git a/src/core/user_script.h b/src/core/user_script.h
index 5ad53fdc1..8f65f4b74 100644
--- a/src/core/user_script.h
+++ b/src/core/user_script.h
@@ -63,7 +63,7 @@ namespace QtWebEngineCore {
 
 class UserResourceControllerHost;
 
-class QWEBENGINECORE_PRIVATE_EXPORT UserScript : public QSharedData {
+class Q_WEBENGINECORE_PRIVATE_EXPORT UserScript : public QSharedData {
 public:
     enum InjectionPoint {
         AfterLoad,
diff --git a/src/core/visited_links_manager_qt.h b/src/core/visited_links_manager_qt.h
index 5bbcc5983..ecac8f30f 100644
--- a/src/core/visited_links_manager_qt.h
+++ b/src/core/visited_links_manager_qt.h
@@ -70,7 +70,7 @@ namespace QtWebEngineCore {
 class ProfileQt;
 class VisitedLinkDelegateQt;
 
-class QWEBENGINECORE_PRIVATE_EXPORT VisitedLinksManagerQt {
+class Q_WEBENGINECORE_PRIVATE_EXPORT VisitedLinksManagerQt {
 
 public:
     virtual~VisitedLinksManagerQt();
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index c6e4f2256..79aa68456 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -91,7 +91,7 @@ class RenderViewObserverHostQt;
 class WebChannelIPCTransportHost;
 class WebEngineContext;
 
-class QWEBENGINECORE_PRIVATE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> {
+class Q_WEBENGINECORE_PRIVATE_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 beb41e17f..b388b28d0 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -343,7 +343,7 @@ private:
 };
 
 
-class QWEBENGINECORE_PRIVATE_EXPORT WebContentsAdapterClient {
+class Q_WEBENGINECORE_PRIVATE_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 20af6d31f..cda9e4625 100644
--- a/src/core/web_engine_error.h
+++ b/src/core/web_engine_error.h
@@ -53,7 +53,7 @@
 
 #include "qtwebenginecoreglobal_p.h"
 
-class QWEBENGINECORE_PRIVATE_EXPORT WebEngineError
+class Q_WEBENGINECORE_PRIVATE_EXPORT WebEngineError
 {
 
 public:
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index d7eeaa560..b2a45098a 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -68,7 +68,7 @@ namespace QtWebEngineCore {
 
 class WebContentsAdapter;
 
-class QWEBENGINECORE_PRIVATE_EXPORT WebEngineSettings {
+class Q_WEBENGINECORE_PRIVATE_EXPORT WebEngineSettings {
 public:
     // Attributes. Names match the ones from the public widgets API.
     enum Attribute {
-- 
cgit v1.2.3