diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2014-02-14 11:08:24 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 13:18:26 +0100 |
commit | c974b9c213e267c203fce1f588f667156bbca445 (patch) | |
tree | f1e99e641b8754d91f62a2d4f82ad7e705b93a22 /src/webengine/api/qquickwebengineview.cpp | |
parent | a0f963cdf96f673a51022e356f9c44920a6fb4a2 (diff) |
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 9 |
1 files changed, 2 insertions, 7 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()); } } |