diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:19 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:34 +0100 |
| commit | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (patch) | |
| tree | 8b1730f28cb700e58bf254c440c4167991b94fe3 /src/core | |
| parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
| parent | 489c9d0f631f79057bb16994b6719395d97f80ab (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I98705a1bb82917147f36a89761eedfc755a45bc5
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/api/qwebenginecallback.h | 2 | ||||
| -rw-r--r-- | src/core/api/qwebenginecallback_p.h | 2 | ||||
| -rw-r--r-- | src/core/api/qwebengineurlrequestinfo.cpp | 3 | ||||
| -rw-r--r-- | src/core/core.pro | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/core/api/qwebenginecallback.h b/src/core/api/qwebenginecallback.h index a8758df7d..3bb993757 100644 --- a/src/core/api/qwebenginecallback.h +++ b/src/core/api/qwebenginecallback.h @@ -90,9 +90,11 @@ private: Q_DECLARE_SHARED(QWebEngineCallback<int>) Q_DECLARE_SHARED(QWebEngineCallback<const QByteArray &>) +#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineCallback<bool>) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineCallback<const QString &>) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineCallback<const QVariant &>) +#endif QT_END_NAMESPACE diff --git a/src/core/api/qwebenginecallback_p.h b/src/core/api/qwebenginecallback_p.h index 348fed464..f93e863eb 100644 --- a/src/core/api/qwebenginecallback_p.h +++ b/src/core/api/qwebenginecallback_p.h @@ -239,10 +239,12 @@ void CallbackDirectory::CallbackSharedDataPointer<T>::invokeEmpty() parent->invokeEmptyInternal(callback); } +#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) #define CHECK_RELOCATABLE(x) \ Q_STATIC_ASSERT((QTypeInfoQuery<QWebEngineCallback< x > >::isRelocatable)); FOR_EACH_TYPE(CHECK_RELOCATABLE) #undef CHECK_RELOCATABLE +#endif } // namespace QtWebEngineCore diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp index e53d9afb6..f229a9748 100644 --- a/src/core/api/qwebengineurlrequestinfo.cpp +++ b/src/core/api/qwebengineurlrequestinfo.cpp @@ -107,6 +107,9 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::OtherNavigation, Q it possible to intercept URL requests. This function is executed on the IO thread, and therefore running long tasks here will block networking. + \a info contains the information about the URL request and will track internally + whether its members have been altered. + \sa QWebEngineProfile::setRequestInterceptor */ diff --git a/src/core/core.pro b/src/core/core.pro index 09eee496f..a205d39a0 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -20,7 +20,8 @@ core_api.depends = gyp_run core_module.file = core_module.pro core_module.depends = core_api -SUBDIRS += core_gyp_generator +SUBDIRS += core_headers \ + core_gyp_generator !win32 { # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that @@ -36,6 +37,5 @@ SUBDIRS += core_gyp_generator } SUBDIRS += gyp_run \ - core_headers \ core_api \ core_module |