WASM: don't ignore custom QSurfaceFormat settings
Previously, Qt would always ignore user's custom QSurfaceFormat settings and this behavior makes user have no way to control the preferred OpenGL version when running on WASM. And after reading the wasm platform plugin code, I don't see any reason why we should limit ourself to the default OpenGL version. And I've tested this patch locally, Qt still work normally if I set a newer OpenGL version. Pick-to: 6.6 6.5 Change-Id: I0cfb831d6a722fe61cc85808a6d9e3098c73d82e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
3e801b5477
commit
33a9cbef65
@ -152,6 +152,11 @@ QWasmWindow::~QWasmWindow()
|
||||
#endif
|
||||
}
|
||||
|
||||
QSurfaceFormat QWasmWindow::format() const
|
||||
{
|
||||
return window()->requestedFormat();
|
||||
}
|
||||
|
||||
void QWasmWindow::onRestoreClicked()
|
||||
{
|
||||
window()->setWindowState(Qt::WindowNoState);
|
||||
|
@ -49,6 +49,8 @@ public:
|
||||
QWasmBackingStore *backingStore);
|
||||
~QWasmWindow() final;
|
||||
|
||||
QSurfaceFormat format() const override;
|
||||
|
||||
void paint();
|
||||
void setZOrder(int order);
|
||||
void setWindowCursor(QByteArray cssCursorName);
|
||||
|
Loading…
Reference in New Issue
Block a user