diff --git a/examples/quick/quicknanobrowser/main.cpp b/examples/quick/quicknanobrowser/main.cpp index 0f0278c22df0ebf53a4feac846f6c1b3dbebfcde..6c2f91de6dd9397800213f7e725429cc692bbc96 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 8adad10f028b340d26279e8a0539c40552236b2e..7e06aed658d3d6c09ab5fb2189332f5a5c1c4285 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 f067895d561b0301ad1ae55dfe38b7166608731a..53ce2dbd3f7c442c3909ea74ff4d07f7aa4ef5a0 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 c7d3d7e27464af903ac4f8795a124c5eb66a9270..195b26add5a7570999639dad91661c88c485d1f4 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 2a4ae53d0870251199592afa8d4dfbd263b3e9e1..842f530110e4a723be1d9da794ccf57e58868cd9 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 4233e91bd60365058d445f7177ae54b88d9139cf..677f3cf1123e438a1a8f4895cc4f25cc4a5c6037 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 727b5661b3b2c08013e5d49e619eb7190c982de8..6c42a3b7a0d8eafb1716a7ad29d9d60dd7645441 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 fb396c34e0d6a55997df042f0a664d88e865153b..98812626366af54336ecd57eb445089b3e0af2f9 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 9a983a2b7725ec3f5232c8a2cbc70f376ebccada..3aea86378616547a2d6976ab8177035036aab2c7 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 9edcb181989dddc2f8793cf57b0c6e8b2f0dd4cb..30f4a60033c97f830a10589258b20b6fac12869a 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 dc95844a7a72958ab9142e7b2f32e7027246be63..95f9ba7cf93444bf004a5f006ec0c769309c4c28 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