From 1ebdd7130a237230b1edf2d36718df711a1dbc60 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Mon, 28 Nov 2022 15:41:44 +0100 Subject: Remove the OpenGL compile guards around QWasmBackingStore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is no longer needed as OpenGL is no longer necessary for the backing store on WASM. Change-Id: I3eaa8094558947da2d1cc5526533f9f3fc8afeab Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmintegration.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/plugins/platforms/wasm/qwasmintegration.cpp') diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index d7c8d032687..4c6f1b14c84 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -14,9 +14,7 @@ #include "qwasmstring.h" #include "qwasmwindow.h" -#ifndef QT_NO_OPENGL -# include "qwasmbackingstore.h" -#endif +#include "qwasmbackingstore.h" #include "qwasmfontdatabase.h" #if defined(Q_OS_UNIX) #include @@ -174,14 +172,10 @@ QPlatformWindow *QWasmIntegration::createPlatformWindow(QWindow *window) const QPlatformBackingStore *QWasmIntegration::createPlatformBackingStore(QWindow *window) const { -#ifndef QT_NO_OPENGL QWasmCompositor *compositor = QWasmScreen::get(window->screen())->compositor(); QWasmBackingStore *backingStore = new QWasmBackingStore(compositor, window); m_backingStores.insert(window, backingStore); return backingStore; -#else - return nullptr; -#endif } void QWasmIntegration::removeBackingStore(QWindow* window) -- cgit v1.2.3