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/content_browser_client_qt.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/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 4 |
1 files changed, 0 insertions, 4 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, |