diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 6 | ||||
| -rw-r--r-- | src/gui/configure.pri | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 413305be4b..51e0389f14 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1081,7 +1081,7 @@ "opengles3": { "label": "OpenGL ES 3.0", "condition": "features.opengles2 && !features.angle && tests.opengles3", - "disable": "config.html5", + "disable": "config.webassembly", "output": [ "publicFeature", { "type": "define", "name": "QT_OPENGL_ES_3" } @@ -1090,7 +1090,7 @@ "opengles31": { "label": "OpenGL ES 3.1", "condition": "features.opengles3 && tests.opengles31", - "disable": "config.html5", + "disable": "config.webassembly", "output": [ "publicFeature", { "type": "define", "name": "QT_OPENGL_ES_3_1" } @@ -1109,7 +1109,7 @@ "enable": "input.opengl == 'desktop'", "disable": "input.opengl == 'es2' || input.opengl == 'dynamic' || input.opengl == 'no'", "condition": "(config.win32 && !config.winrt && !features.opengles2 && (config.msvc || libs.opengl)) - || (!config.watchos && !config.win32 && !config.html5 && libs.opengl)" + || (!config.watchos && !config.win32 && !config.webassembly && libs.opengl)" }, "opengl-dynamic": { "label": "Dynamic OpenGL", diff --git a/src/gui/configure.pri b/src/gui/configure.pri index 6eb9d0fe07..be4378e4fd 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -55,7 +55,7 @@ defineTest(qtConfTest_qpaDefaultPlatform) { else: qnx: name = qnx else: integrity: name = integrityfb else: haiku: name = haiku - else: html5: name = html5 + else: wasm: name = webassembly else: name = xcb $${1}.value = $$name diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index cc66827b41..09805369f0 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -114,7 +114,7 @@ # include <QtCore/QLibraryInfo> #endif // Q_OS_WIN -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM #include <emscripten.h> #endif @@ -1609,7 +1609,7 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() qt_gl_set_global_share_context(0); } #endif -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM EM_ASM( //unmount persistent directory as IDBFS FS.unmount('/home/web_user'); diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index deaace2db2..16224b6cd6 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -977,7 +977,7 @@ bool QOpenGLContext::makeCurrent(QSurface *surface) if (!surface->surfaceHandle()) return false; if (!surface->supportsOpenGL()) { -#ifndef Q_OS_HTML5 // ### work around the HTML5 platform plugin using QOpenGLContext with raster surfaces. +#ifndef Q_OS_WASM // ### work around the WASM platform plugin using QOpenGLContext with raster surfaces. qWarning() << "QOpenGLContext::makeCurrent() called with non-opengl surface" << surface; return false; #endif diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 20f1d06895..0831ca32a0 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -602,7 +602,7 @@ void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext const int samples = requestedSamples; // free existing attachments -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM if (depth_buffer_guard) { funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, 0); depth_buffer_guard->free(); @@ -628,7 +628,7 @@ void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext // In practice, a combined depth-stencil buffer is supported by all desktop platforms, while a // separate stencil buffer is not. On embedded devices however, a combined depth-stencil buffer // might not be supported while separate buffers are, according to QTBUG-12861. -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM // WebGL doesn't allow separately attach buffers to // STENCIL_ATTACHMENT and DEPTH_ATTACHMENT if (attachment == QOpenGLFramebufferObject::CombinedDepthStencil) { @@ -747,12 +747,12 @@ void QOpenGLFramebufferObjectPrivate::initDepthStencilAttachments(QOpenGLContext stencil_buffer = 0; } } -#endif //Q_OS_HTML5 +#endif //Q_OS_WASM // The FBO might have become valid after removing the depth or stencil buffer. valid = checkFramebufferStatus(ctx); -#ifdef Q_OS_HTML5 +#ifdef Q_OS_WASM if (depth_buffer) { #else if (depth_buffer && stencil_buffer) { |