diff options
author | Andy Nichols <andy.nichols@qt.io> | 2016-08-10 17:56:10 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-10-02 08:40:22 +0000 |
commit | 7d19f3b647f4e5ac4b5f0d2278703476f5a9ed1c (patch) | |
tree | 8f770c11fe270d71be7ab712ffc33df9d7bec53c /src/core/content_browser_client_qt.cpp | |
parent | 2ec47c9921a1e381943159f540b45c105d2ff1db (diff) |
Fix building when QT_NO_OPENGL is defined
Task-number: QTBUG-54327
Change-Id: I759598d56aa0a74b64092365b422a743fb508ac6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index a2453070e..64964dc09 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -100,7 +100,9 @@ #include <QGuiApplication> #include <QLocale> -#include <QOpenGLContext> +#ifndef QT_NO_OPENGL +# include <QOpenGLContext> +#endif #include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE @@ -322,12 +324,14 @@ private: void ShareGroupQtQuick::AboutToAddFirstContext() { +#ifndef QT_NO_OPENGL // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering. QOpenGLContext *shareContext = qt_gl_global_share_context(); if (!shareContext) { qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function."); } m_shareContextQtQuick = make_scoped_refptr(new QtShareGLContext(shareContext)); +#endif } class QuotaPermissionContextQt : public content::QuotaPermissionContext { |