diff options
36 files changed, 301 insertions, 59 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp index 0353dac7d..d3cf72477 100644 --- a/src/core/api/qtwebenginecoreglobal.cpp +++ b/src/core/api/qtwebenginecoreglobal.cpp @@ -68,7 +68,7 @@ static void deleteShareContext() // after the QGuiApplication creation, when AA_ShareOpenGLContexts fills // the same need but the flag has to be set earlier. -QWEBENGINE_PRIVATE_EXPORT void initialize() +QWEBENGINECORE_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 27bb4255a..bcff622b7 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 QWEBENGINE_EXPORT Q_DECL_EXPORT +# define QWEBENGINECORE_EXPORT Q_DECL_EXPORT #else -# define QWEBENGINE_EXPORT Q_DECL_IMPORT +# define QWEBENGINECORE_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 d7625a24a..27bf2d9f9 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 QWEBENGINE_PRIVATE_EXPORT QWEBENGINE_EXPORT +#define QWEBENGINECORE_PRIVATE_EXPORT QWEBENGINECORE_EXPORT #endif // QTWEBENGINECOREGLOBAL_P_H diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h index 87d7390a3..764c7b9a7 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 QWEBENGINE_EXPORT QWebEngineCookieStore : public QObject { +class QWEBENGINECORE_EXPORT QWebEngineCookieStore : public QObject { Q_OBJECT public: diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h index e44a80f53..c7ab429d8 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 QWEBENGINE_PRIVATE_EXPORT QWebEngineCookieStorePrivate +class QWEBENGINECORE_PRIVATE_EXPORT QWebEngineCookieStorePrivate { Q_DECLARE_PUBLIC(QWebEngineCookieStore) struct CookieData { diff --git a/src/core/api/qwebenginehttprequest.h b/src/core/api/qwebenginehttprequest.h index 5b5948ba1..c6b5a6b63 100644 --- a/src/core/api/qwebenginehttprequest.h +++ b/src/core/api/qwebenginehttprequest.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QWebEngineHttpRequestPrivate; -class QWEBENGINE_EXPORT QWebEngineHttpRequest +class QWEBENGINECORE_EXPORT QWebEngineHttpRequest { public: enum Method { diff --git a/src/core/api/qwebenginequotarequest.h b/src/core/api/qwebenginequotarequest.h index be71635c1..a759f5bb6 100644 --- a/src/core/api/qwebenginequotarequest.h +++ b/src/core/api/qwebenginequotarequest.h @@ -51,7 +51,7 @@ class QuotaRequestController; QT_BEGIN_NAMESPACE -class QWEBENGINE_EXPORT QWebEngineQuotaRequest { +class QWEBENGINECORE_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 b3707bc59..12b1d6edf 100644 --- a/src/core/api/qwebengineregisterprotocolhandlerrequest.h +++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h @@ -51,7 +51,7 @@ class WebContentsDelegateQt; QT_BEGIN_NAMESPACE -class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerRequest { +class QWEBENGINECORE_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 52463a1b3..68c46dcf4 100644 --- a/src/core/api/qwebengineurlrequestinfo.h +++ b/src/core/api/qwebengineurlrequestinfo.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE class QWebEngineUrlRequestInfoPrivate; -class QWEBENGINE_EXPORT QWebEngineUrlRequestInfo { +class QWEBENGINECORE_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 6e0f93e49..dc2a15ee3 100644 --- a/src/core/api/qwebengineurlrequestinterceptor.h +++ b/src/core/api/qwebengineurlrequestinterceptor.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class QWEBENGINE_EXPORT QWebEngineUrlRequestInterceptor : public QObject +class QWEBENGINECORE_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 7a7dbd83d..7ce8be7ec 100644 --- a/src/core/api/qwebengineurlrequestjob.h +++ b/src/core/api/qwebengineurlrequestjob.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QIODevice; -class QWEBENGINE_EXPORT QWebEngineUrlRequestJob : public QObject { +class QWEBENGINECORE_EXPORT QWebEngineUrlRequestJob : public QObject { Q_OBJECT public: ~QWebEngineUrlRequestJob(); diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h index 757c461f4..23fee4b95 100644 --- a/src/core/api/qwebengineurlschemehandler.h +++ b/src/core/api/qwebengineurlschemehandler.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QWebEngineUrlRequestJob; -class QWEBENGINE_EXPORT QWebEngineUrlSchemeHandler : public QObject { +class QWEBENGINECORE_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 2fa4e854f..4771ffcd7 100644 --- a/src/core/authentication_dialog_controller.h +++ b/src/core/authentication_dialog_controller.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef AUTHENTICATION_DIALOG_CONTROLLER_H #define AUTHENTICATION_DIALOG_CONTROLLER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QObject> @@ -48,7 +59,7 @@ namespace QtWebEngineCore { class AuthenticationDialogControllerPrivate; -class QWEBENGINE_EXPORT AuthenticationDialogController : public QObject { +class QWEBENGINECORE_PRIVATE_EXPORT AuthenticationDialogController : public QObject { Q_OBJECT public: ~AuthenticationDialogController(); diff --git a/src/core/browser_context_adapter.h b/src/core/browser_context_adapter.h index 52dab2325..19fed8951 100644 --- a/src/core/browser_context_adapter.h +++ b/src/core/browser_context_adapter.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef BROWSER_CONTEXT_ADAPTER_H #define BROWSER_CONTEXT_ADAPTER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QEnableSharedFromThis> #include <QList> @@ -63,7 +74,7 @@ class ProfileQt; class UserResourceControllerHost; class VisitedLinksManagerQt; -class QWEBENGINE_EXPORT BrowserContextAdapter : public QObject +class QWEBENGINECORE_PRIVATE_EXPORT BrowserContextAdapter : public QObject { public: explicit BrowserContextAdapter(const QString &storagePrefix = QString()); diff --git a/src/core/browser_context_adapter_client.h b/src/core/browser_context_adapter_client.h index 02bee8ed6..b6351c15b 100644 --- a/src/core/browser_context_adapter_client.h +++ b/src/core/browser_context_adapter_client.h @@ -37,16 +37,27 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef BROWSER_CONTEXT_ADAPTER_CLIENT_H #define BROWSER_CONTEXT_ADAPTER_CLIENT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QString> #include <QUrl> namespace QtWebEngineCore { -class QWEBENGINE_EXPORT BrowserContextAdapterClient +class QWEBENGINECORE_PRIVATE_EXPORT BrowserContextAdapterClient { public: // Keep in sync with content::DownloadItem::DownloadState diff --git a/src/core/certificate_error_controller.h b/src/core/certificate_error_controller.h index 554281644..7ccd03c70 100644 --- a/src/core/certificate_error_controller.h +++ b/src/core/certificate_error_controller.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef CERTIFICATE_ERROR_CONTROLLER_H #define CERTIFICATE_ERROR_CONTROLLER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QtCore/QDateTime> #include <QtCore/QUrl> @@ -49,7 +60,7 @@ QT_BEGIN_NAMESPACE class CertificateErrorControllerPrivate; -class QWEBENGINE_EXPORT CertificateErrorController { +class QWEBENGINECORE_PRIVATE_EXPORT CertificateErrorController { public: CertificateErrorController(CertificateErrorControllerPrivate *p); ~CertificateErrorController(); diff --git a/src/core/color_chooser_controller.h b/src/core/color_chooser_controller.h index c0cb05172..4c1b81a9a 100644 --- a/src/core/color_chooser_controller.h +++ b/src/core/color_chooser_controller.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef COLOR_CHOOSER_CONTROLLER_H #define COLOR_CHOOSER_CONTROLLER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QObject> @@ -48,7 +59,7 @@ namespace QtWebEngineCore { class ColorChooserControllerPrivate; -class QWEBENGINE_EXPORT ColorChooserController : public QObject { +class QWEBENGINECORE_PRIVATE_EXPORT ColorChooserController : public QObject { Q_OBJECT public: ~ColorChooserController(); diff --git a/src/core/favicon_manager.h b/src/core/favicon_manager.h index 28244f90b..f9758d0f0 100644 --- a/src/core/favicon_manager.h +++ b/src/core/favicon_manager.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef FAVICON_MANAGER_H #define FAVICON_MANAGER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <memory> #include <QtCore/QMap> #include <QtCore/QObject> @@ -71,7 +82,7 @@ namespace QtWebEngineCore { class WebContentsAdapterClient; // Based on src/3rdparty/chromium/content/public/common/favicon_url.h -class QWEBENGINE_EXPORT FaviconInfo { +class QWEBENGINECORE_PRIVATE_EXPORT FaviconInfo { public: enum FaviconType { InvalidIcon, @@ -97,7 +108,7 @@ public: }; -class QWEBENGINE_EXPORT FaviconManager { +class QWEBENGINECORE_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 66f28c3fc..7507cf358 100644 --- a/src/core/file_picker_controller.h +++ b/src/core/file_picker_controller.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef FILE_PICKER_CONTROLLER_H #define FILE_PICKER_CONTROLLER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QObject> #include <QStringList> @@ -50,7 +61,7 @@ namespace content { namespace QtWebEngineCore { -class QWEBENGINE_EXPORT FilePickerController : public QObject { +class QWEBENGINECORE_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 1cfdfa437..1ba94e095 100644 --- a/src/core/javascript_dialog_controller.h +++ b/src/core/javascript_dialog_controller.h @@ -37,6 +37,17 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef JAVASCRIPT_DIALOG_CONTROLLER_H #define JAVASCRIPT_DIALOG_CONTROLLER_H @@ -48,7 +59,7 @@ namespace QtWebEngineCore { class JavaScriptDialogControllerPrivate; -class QWEBENGINE_EXPORT JavaScriptDialogController : public QObject { +class QWEBENGINECORE_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 8717e17d0..fc7e7a49d 100644 --- a/src/core/net/cookie_monster_delegate_qt.h +++ b/src/core/net/cookie_monster_delegate_qt.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef COOKIE_MONSTER_DELEGATE_QT_H #define COOKIE_MONSTER_DELEGATE_QT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" QT_WARNING_PUSH // For some reason adding -Wno-unused-parameter to QMAKE_CXXFLAGS has no @@ -64,7 +75,7 @@ namespace QtWebEngineCore { static const char* const kCookieableSchemes[] = { "http", "https", "qrc", "ws", "wss" }; -class QWEBENGINE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt> { +class QWEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt> { QPointer<QWebEngineCookieStore> m_client; net::CookieMonster *m_cookieMonster; std::vector<std::unique_ptr<net::CookieStore::CookieChangedSubscription>> m_subscriptions; diff --git a/src/core/net/custom_protocol_handler.h b/src/core/net/custom_protocol_handler.h index 1568c269e..3869af143 100644 --- a/src/core/net/custom_protocol_handler.h +++ b/src/core/net/custom_protocol_handler.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef CUSTOM_PROTOCOL_HANDLER_H_ #define CUSTOM_PROTOCOL_HANDLER_H_ -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include "net/url_request/url_request_job_factory.h" #include <QtCore/QByteArray> @@ -60,7 +71,7 @@ class BrowserContextAdapter; // Implements a ProtocolHandler for custom URL schemes. // If |network_delegate_| is NULL then all file requests will fail with ERR_ACCESS_DENIED. -class QWEBENGINE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { +class QWEBENGINECORE_PRIVATE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { public: CustomProtocolHandler(QPointer<BrowserContextAdapter> adapter); diff --git a/src/core/net/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h index 6bbd10909..caabfcf99 100644 --- a/src/core/net/url_request_custom_job_delegate.h +++ b/src/core/net/url_request_custom_job_delegate.h @@ -37,11 +37,22 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef URL_REQUEST_CUSTOM_JOB_DELEGATE_H_ #define URL_REQUEST_CUSTOM_JOB_DELEGATE_H_ #include "base/memory/ref_counted.h" -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QObject> #include <QUrl> @@ -52,7 +63,7 @@ namespace QtWebEngineCore { class URLRequestCustomJobProxy; -class QWEBENGINE_EXPORT URLRequestCustomJobDelegate : public QObject { +class QWEBENGINECORE_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 681030eed..422cafdea 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 QWEBENGINE_EXPORT PdfiumPageWrapperQt { +class QWEBENGINECORE_PRIVATE_EXPORT PdfiumPageWrapperQt { public: PdfiumPageWrapperQt(void *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 7886c51c0..f4ac557a0 100644 --- a/src/core/printing/pdfium_document_wrapper_qt.h +++ b/src/core/printing/pdfium_document_wrapper_qt.h @@ -37,17 +37,28 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef PDFIUM_DOCUMENT_WRAPPER_QT_H #define PDFIUM_DOCUMENT_WRAPPER_QT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QtGui/qimage.h> namespace QtWebEngineCore { class PdfiumPageWrapperQt; -class QWEBENGINE_EXPORT PdfiumDocumentWrapperQt +class QWEBENGINECORE_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 890bf5a85..d171828d5 100644 --- a/src/core/process_main.h +++ b/src/core/process_main.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ -#include "qtwebenginecoreglobal.h" +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtWebEngineCore/private/qtwebenginecoreglobal_p.h> namespace QtWebEngine { -QWEBENGINE_EXPORT int processMain(int argc, const char **argv); +QWEBENGINECORE_PRIVATE_EXPORT int processMain(int argc, const char **argv); } // namespace diff --git a/src/core/render_view_context_menu_qt.h b/src/core/render_view_context_menu_qt.h index 1694f66e6..d8ca2775c 100644 --- a/src/core/render_view_context_menu_qt.h +++ b/src/core/render_view_context_menu_qt.h @@ -37,6 +37,17 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef RENDER_VIEW_CONTEXT_MENU_QT_H #define RENDER_VIEW_CONTEXT_MENU_QT_H @@ -44,7 +55,7 @@ namespace QtWebEngineCore { -class QWEBENGINE_EXPORT RenderViewContextMenuQt +class QWEBENGINECORE_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 bcd0f49f7..55dd1923a 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H #define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QRect> #include <QtGui/qwindowdefs.h> @@ -67,7 +78,7 @@ namespace QtWebEngineCore { class WebContentsAdapterClient; -class QWEBENGINE_EXPORT RenderWidgetHostViewQtDelegateClient { +class QWEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegateClient { public: virtual ~RenderWidgetHostViewQtDelegateClient() { } virtual QSGNode *updatePaintNode(QSGNode *) = 0; @@ -80,7 +91,7 @@ public: virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) = 0; }; -class QWEBENGINE_EXPORT RenderWidgetHostViewQtDelegate { +class QWEBENGINECORE_PRIVATE_EXPORT RenderWidgetHostViewQtDelegate { public: virtual ~RenderWidgetHostViewQtDelegate() { } virtual void initAsChild(WebContentsAdapterClient*) = 0; diff --git a/src/core/renderer_host/user_resource_controller_host.h b/src/core/renderer_host/user_resource_controller_host.h index cd02b4757..40b685163 100644 --- a/src/core/renderer_host/user_resource_controller_host.h +++ b/src/core/renderer_host/user_resource_controller_host.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef USER_RESOURCE_CONTROLLER_HOST_H #define USER_RESOURCE_CONTROLLER_HOST_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QtCore/QSet> #include <QtCore/QScopedPointer> @@ -55,7 +66,7 @@ namespace QtWebEngineCore { class WebContentsAdapter; -class QWEBENGINE_EXPORT UserResourceControllerHost { +class QWEBENGINECORE_PRIVATE_EXPORT UserResourceControllerHost { public: UserResourceControllerHost(); diff --git a/src/core/user_script.h b/src/core/user_script.h index 93cde9aa6..7743521f2 100644 --- a/src/core/user_script.h +++ b/src/core/user_script.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef USER_SCRIPT_H #define USER_SCRIPT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QtCore/QAtomicInt> #include <QtCore/QScopedPointer> @@ -53,7 +64,7 @@ namespace QtWebEngineCore { class UserResourceControllerHost; -class QWEBENGINE_EXPORT UserScript : public QSharedData { +class QWEBENGINECORE_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 30265e033..ee836d118 100644 --- a/src/core/visited_links_manager_qt.h +++ b/src/core/visited_links_manager_qt.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef VISITED_LINKS_MANAGER_QT_H #define VISITED_LINKS_MANAGER_QT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QList> #include <QScopedPointer> @@ -59,7 +70,7 @@ namespace QtWebEngineCore { class BrowserContextAdapter; class VisitedLinkDelegateQt; -class QWEBENGINE_EXPORT VisitedLinksManagerQt { +class QWEBENGINECORE_PRIVATE_EXPORT VisitedLinksManagerQt { public: virtual~VisitedLinksManagerQt(); diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 95cc0eb93..f0a716250 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef WEB_CONTENTS_ADAPTER_H #define WEB_CONTENTS_ADAPTER_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include "web_contents_adapter_client.h" #include <memory> #include <QtGui/qtgui-config.h> @@ -79,7 +90,7 @@ class RenderViewObserverHostQt; class WebChannelIPCTransportHost; class WebEngineContext; -class QWEBENGINE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> { +class QWEBENGINECORE_PRIVATE_EXPORT WebContentsAdapter : public QEnableSharedFromThis<WebContentsAdapter> { public: static QSharedPointer<WebContentsAdapter> createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient); // Takes ownership of the WebContents. diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index 1e3f4981b..177591772 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef WEB_CONTENTS_ADAPTER_CLIENT_H #define WEB_CONTENTS_ADAPTER_CLIENT_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QFlags> #include <QRect> @@ -328,7 +339,7 @@ private: }; -class QWEBENGINE_EXPORT WebContentsAdapterClient { +class QWEBENGINECORE_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 793d9d615..20af6d31f 100644 --- a/src/core/web_engine_error.h +++ b/src/core/web_engine_error.h @@ -37,12 +37,23 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef WEB_ENGINE_ERROR_H #define WEB_ENGINE_ERROR_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" -class QWEBENGINE_EXPORT WebEngineError +class QWEBENGINECORE_PRIVATE_EXPORT WebEngineError { public: diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h index eba9bf7ea..ec99c5a29 100644 --- a/src/core/web_engine_settings.h +++ b/src/core/web_engine_settings.h @@ -37,10 +37,21 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef WEB_ENGINE_SETTINGS_H #define WEB_ENGINE_SETTINGS_H -#include "qtwebenginecoreglobal.h" +#include "qtwebenginecoreglobal_p.h" #include <QScopedPointer> #include <QHash> @@ -57,7 +68,7 @@ namespace QtWebEngineCore { class BatchTimer; class WebContentsAdapter; -class QWEBENGINE_EXPORT WebEngineSettings { +class QWEBENGINECORE_PRIVATE_EXPORT WebEngineSettings { public: // Attributes. Names match the ones from the public widgets API. enum Attribute { diff --git a/src/process/process.pro b/src/process/process.pro index f442439e8..0bdc9dd93 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -3,7 +3,7 @@ TARGET = $$QTWEBENGINEPROCESS_NAME # Needed to set LSUIElement=1 QMAKE_INFO_PLIST = Info_mac.plist -QT += webenginecore +QT_PRIVATE += core-private webenginecore-private INCLUDEPATH += ../core |