Make Qt 5.2 a minimum requirement

Cleanup version ifdefs and v8-private dependencies.

Change-Id: Iac393c06dfba02499e60d713d9f4d04ef0c9e617
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

5 files changed, 2 insertions, 16 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 727b5661b..6c42a3b7a 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -117,10 +117,8 @@ UIDelegatesManager *QQuickWebEngineViewPrivate::ui()
 
 RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode mode)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
     if (mode == HardwareAccelerationMode)
         return new RenderWidgetHostViewQtDelegateQuick(client);
-#endif
     return new RenderWidgetHostViewQtDelegateQuickPainted(client);
 }
 
@@ -495,11 +493,8 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     Q_FOREACH(QQuickItem *child, childItems()) {
-        Q_ASSERT(
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
-            qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child) ||
-#endif
-            qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child));
+        Q_ASSERT(qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)
+                 || qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child));
         child->setSize(newGeometry.size());
     }
 }
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro
index fb396c34e..988126263 100644
--- a/src/webengine/plugin/experimental/experimental.pro
+++ b/src/webengine/plugin/experimental/experimental.pro
@@ -6,8 +6,6 @@ IMPORT_VERSION = 1.0
 QT += webengine qml quick
 QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
 
-qtHaveModule(v8): QT_PRIVATE += v8-private
-
 INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine/api
 
 SOURCES = plugin.cpp
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 9a983a2b7..3aea86378 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -41,7 +41,6 @@
 
 #include "render_widget_host_view_qt_delegate_quick.h"
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
 RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent)
     : RenderWidgetHostViewQtDelegateQuickBase<QQuickItem>(client, parent)
 {
@@ -69,7 +68,6 @@ QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode,
 {
     return m_client->updatePaintNode(oldNode, QQuickItem::window());
 }
-#endif // QT_VERSION
 
 RenderWidgetHostViewQtDelegateQuickPainted::RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent)
     : RenderWidgetHostViewQtDelegateQuickBase<QQuickPaintedItem>(client, parent)
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index 9edcb1819..30f4a6003 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -223,7 +223,6 @@ protected:
     RenderWidgetHostViewQtDelegateClient *m_client;
 };
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
 class RenderWidgetHostViewQtDelegateQuick : public RenderWidgetHostViewQtDelegateQuickBase<QQuickItem>
 {
     Q_OBJECT
@@ -236,7 +235,6 @@ public:
     virtual void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
     virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 };
-#endif // QT_VERSION
 
 class RenderWidgetHostViewQtDelegateQuickPainted : public RenderWidgetHostViewQtDelegateQuickBase<QQuickPaintedItem>
 {
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
index dc95844a7..95f9ba7cf 100644
--- a/src/webengine/webengine.pro
+++ b/src/webengine/webengine.pro
@@ -6,9 +6,6 @@ DEFINES += QT_BUILD_WEBENGINE_LIB
 QT += qml quick
 QT_PRIVATE += qml-private quick-private gui-private core-private
 
-# Remove this as soon as we have a hard-dependency on Qt 5.2
-qtHaveModule(v8): QT_PRIVATE += v8-private
-
 INCLUDEPATH += api ../core
 
 # FIXME: all this should eventually be turned into QT += webenginecore