4 files changed, 9 insertions, 2 deletions
diff --git a/src/core/api/qwebenginecallback.h b/src/core/api/qwebenginecallback.h
index de617eb25..9c7e43b92 100644
--- a/src/core/api/qwebenginecallback.h
+++ b/src/core/api/qwebenginecallback.h
@@ -93,9 +93,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 fdaf84d21..b88ef4d2c 100644
--- a/src/core/api/qwebenginecallback_p.h
+++ b/src/core/api/qwebenginecallback_p.h
@@ -242,10 +242,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 7325b131e..029c77fe8 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -110,6 +110,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