From c974b9c213e267c203fce1f588f667156bbca445 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Fri, 14 Feb 2014 11:08:24 +0100
Subject: 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>
---
 src/webengine/api/qquickwebengineview.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/webengine/api')

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());
     }
 }
-- 
cgit v1.2.3