From 736b2c5785060b2d9c4b9c40c31408fa5e990f8a Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 2 Feb 2016 13:08:23 +0100
Subject: Fix build against Qt 5.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make QtWebEngine 5.6 buildable as an upgrade to Qt 5.5

Change-Id: Ic5de7fc414374d8492434dd5b956cbb90fff2e3e
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
---
 src/core/api/qwebenginecallback.h   | 2 ++
 src/core/api/qwebenginecallback_p.h | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/core/api')

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
 
-- 
cgit v1.2.3