diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-05-11 15:41:50 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2018-06-15 12:47:12 +0000 |
commit | 01777e8fcb4ca2e16bfa05c914cfdbcccf132bc9 (patch) | |
tree | aa08941647083a8185fb7c05acfd099fa492b1f2 /src/core/net | |
parent | 2715088397641a85c1fb61d64bdb4c677713337f (diff) |
Update export symbols for webenginecore module
Use own WEBENGINECORE_EXPORT define, mark most headers private
and use WEBENGINECORE_PRIVATE_EXPORT for it.
For sanity, add "WARNING" as for private headers even though they are
never installed.
Change-Id: I523d28c1d00217f48bc63dabf138dd3a7eb482d4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/net')
-rw-r--r-- | src/core/net/cookie_monster_delegate_qt.h | 15 | ||||
-rw-r--r-- | src/core/net/custom_protocol_handler.h | 15 | ||||
-rw-r--r-- | src/core/net/url_request_custom_job_delegate.h | 15 |
3 files changed, 39 insertions, 6 deletions
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(); |