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/api | |
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/api')
-rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qtwebenginecoreglobal.h | 4 | ||||
-rw-r--r-- | src/core/api/qtwebenginecoreglobal_p.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginecookiestore.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginecookiestore_p.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginehttprequest.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginequotarequest.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineregisterprotocolhandlerrequest.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineurlrequestinfo.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineurlrequestinterceptor.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineurlrequestjob.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebengineurlschemehandler.h | 2 |
12 files changed, 13 insertions, 13 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); |