From 3ee51f8f085da394851857b0d6a42df537ca99da Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 21 Sep 2017 11:39:17 +0200 Subject: Use ozone for x11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/core/delegated_frame_node.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/delegated_frame_node.h') diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h index 5d967841d..e37ad08a3 100644 --- a/src/core/delegated_frame_node.h +++ b/src/core/delegated_frame_node.h @@ -143,7 +143,7 @@ private: QWaitCondition m_mailboxesFetchedWaitCond; QMutex m_mutex; QList m_textureFences; -#if defined(USE_X11) +#if defined(USE_OZONE) bool m_contextShared; QScopedPointer m_offsurface; #endif -- cgit v1.2.3