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/core | |
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/core')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/core_gyp_generator.pro | 1 | ||||
-rw-r--r-- | src/core/delegated_frame_node.cpp | 2 | ||||
-rw-r--r-- | src/core/delegated_frame_node.h | 4 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 4 |
5 files changed, 0 insertions, 15 deletions
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() |