summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikolaj Boc <[email protected]>2022-11-28 15:41:44 +0100
committerMikolaj Boc <[email protected]>2022-11-30 20:05:10 +0100
commit1ebdd7130a237230b1edf2d36718df711a1dbc60 (patch)
tree9f1a6142e49f38f367d50884c737d7928e61aa95
parenta812d1eb661ea5acedc3258405a1035781e3956b (diff)
Remove the OpenGL compile guards around QWasmBackingStore
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 <[email protected]>
-rw-r--r--src/plugins/platforms/wasm/qwasmintegration.cpp8
1 files changed, 1 insertions, 7 deletions
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 <QtGui/private/qgenericunixeventdispatcher_p.h>
@@ -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)