diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-09-21 11:39:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-02 20:52:21 +0000 |
commit | 3ee51f8f085da394851857b0d6a42df537ca99da (patch) | |
tree | 9c4e81cd778caeedbb45c075301cb8dc0506b948 /src/core/web_engine_context.cpp | |
parent | 20abae270a20d312d45fc7f850af44603f5f38de (diff) |
Use ozone for x11
Switch to use ozone also for x11/glx. This way we have a
more elegant approach to hook in our gl surface classes
and we use ozone for all linux qpa backends. Moreover,
we have now also more fine grain control to reimplement
gl surface handling logic.
This also aims to fix currently broken wayland backend,
but instead of patching the broken x11 calls, we simply reuse
ozone which does not use x11 for ozone egl.
Add webengine-x11 check to handle ozone glx plugin compilation.
For ozone egl backend reimplement missing functions.
Task-number: QTBUG-65682
Task-number: QTBUG-51631
Change-Id: I8b45c6f4d09a1c703efb12b6452d78ab385371ab
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r-- | src/core/web_engine_context.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 4eb689d93..33a5a5e0d 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -316,14 +316,6 @@ WebEngineContext::WebEngineContext() , m_browserRunner(content::BrowserMainRunner::Create()) , m_globalQObject(new QObject()) { -#if defined(USE_X11) - QString platform = qApp->platformName(); - if (platform != QLatin1String("xcb")) { - qWarning("WebEngine compiled with X11 support, however qpa backend is not xcb. " - "This may fail."); - } -#endif - #ifdef Q_OS_LINUX // Call qputenv before BrowserMainRunnerImpl::Initialize is called. // http://crbug.com/245466 @@ -453,9 +445,6 @@ WebEngineContext::WebEngineContext() // If the native handle is QEGLNativeContext try to use GL ES/2, if there is no native handle // assume we are using wayland and try GL ES/2, and finally Ozone demands GL ES/2 too. if (qt_gl_global_share_context()->nativeHandle().isNull() -#ifdef USE_OZONE - || true -#endif || !strcmp(qt_gl_global_share_context()->nativeHandle().typeName(), "QEGLNativeContext")) { if (qt_gl_global_share_context()->isOpenGLES()) { |