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: [PATCH] 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>
---
examples/quick/quicknanobrowser/main.cpp | 2 --
src/core/content_browser_client_qt.cpp | 4 ----
src/core/core_gyp_generator.pro | 1 -
src/core/delegated_frame_node.cpp | 2 --
src/core/delegated_frame_node.h | 4 ----
src/core/render_widget_host_view_qt.cpp | 4 ----
src/webengine/api/qquickwebengineview.cpp | 9 ++-------
src/webengine/plugin/experimental/experimental.pro | 2 --
.../render_widget_host_view_qt_delegate_quick.cpp | 2 --
.../render_widget_host_view_qt_delegate_quick.h | 2 --
src/webengine/webengine.pro | 3 ---
11 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/examples/quick/quicknanobrowser/main.cpp b/examples/quick/quicknanobrowser/main.cpp
index 0f0278c22..6c2f91de6 100644
--- a/examples/quick/quicknanobrowser/main.cpp
+++ b/examples/quick/quicknanobrowser/main.cpp
@@ -53,14 +53,12 @@ int main(int argc, char **argv)
{
Application app(argc, argv);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
// This is currently needed by all QtWebEngine application using the HW accelerated QQuickWebView.
// It enables sharing between the QOpenGLContext of all QQuickWindows of the application.
// We have to do so until we expose a public API for it, or chose enable it by default in Qt 5.3.0.
QOpenGLContext shareContext;
shareContext.create();
QSGContext::setSharedOpenGLContext(&shareContext);
-#endif
ApplicationEngine appEngine;
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 8adad10f0..7e06aed65 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -56,9 +56,7 @@
#include "web_contents_view_qt.h"
#include <QGuiApplication>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
#include <QtQuick/private/qsgcontext_p.h>
-#endif
#include <qpa/qplatformnativeinterface.h>
namespace {
@@ -247,12 +245,10 @@ private:
void ShareGroupQtQuick::AboutToAddFirstContext()
{
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
// This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering.
QOpenGLContext *shareContext = QSGContext::sharedOpenGLContext();
Q_ASSERT(shareContext);
m_shareContextQtQuick = make_scoped_refptr(new QtShareGLContext(shareContext));
-#endif
}
content::WebContentsViewPort* ContentBrowserClientQt::OverrideCreateWebContentsView(content::WebContents* web_contents,
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index f067895d5..53ce2dbd3 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -16,7 +16,6 @@ macx: GYP_DYLIB_INSTALL_NAME_BASE = $$getOutDir()/$$getConfigDir()
QT += qml quick
QT_PRIVATE += qml-private quick-private gui-private core-private
-qtHaveModule(v8): QT_PRIVATE += v8-private
# Defining keywords such as 'signal' clashes with the chromium code base.
DEFINES += QT_NO_KEYWORDS \
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index c7d3d7e27..195b26add 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -50,7 +50,6 @@
#include "delegated_frame_node.h"
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
#include "chromium_gpu_helper.h"
#include "type_conversion.h"
#include "yuv_video_node.h"
@@ -523,4 +522,3 @@ void DelegatedFrameNode::syncPointRetired(DelegatedFrameNode *frameNode, QList<M
base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DelegatedFrameNode::fetchTexturesAndUnlockQt, frameNode, mailboxesToFetch));
}
-#endif // QT_VERSION
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index 2a4ae53d0..842f53011 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -50,8 +50,6 @@
#include <QSharedPointer>
#include <QWaitCondition>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
-
QT_BEGIN_NAMESPACE
class QQuickWindow;
QT_END_NAMESPACE
@@ -92,6 +90,4 @@ private:
static void syncPointRetired(DelegatedFrameNode *frameNode, QList<MailboxTexture *> *mailboxesToFetch);
};
-#endif // QT_VERSION
-
#endif // DELEGATED_FRAME_NODE_H
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 4233e91bd..677f3cf11 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -648,7 +648,6 @@ void RenderWidgetHostViewQt::paint(QPainter *painter, const QRectF& boundingRect
QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode, QQuickWindow *window)
{
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
DelegatedFrameNode *frameNode = static_cast<DelegatedFrameNode *>(oldNode);
if (!frameNode)
frameNode = new DelegatedFrameNode(window);
@@ -664,9 +663,6 @@ QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode, QQuickWindow
}
return frameNode;
-#else
- return 0;
-#endif // QT_VERSION
}
void RenderWidgetHostViewQt::fetchBackingStore()
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
--
GitLab