1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: build with -no-feature-accessibility

Browse Source 
Add #ifdefs around the accessibility implementation.

Fixes: QTBUG-111509
Pick-to: 6.5
Change-Id: I9a600781b4bf9545f046efa75f962cc40fe196a6
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
This commit is contained in:
Morten Sørvig 2023-03-01 13:11:10 +01:00
parent b6d04c8a82
commit 3c23d701a7
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/wasm/qwasmaccessibility.cpp
View File

@ -5,10 +5,13 @@
#include "qwasmscreen.h" #include "qwasmscreen.h"
#include "qwasmwindow.h" #include "qwasmwindow.h"
#include "qwasmintegration.h" #include "qwasmintegration.h"
#include <QtGui/private/qaccessiblebridgeutils_p.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#if QT_CONFIG(accessibility)
#include <QtGui/private/qaccessiblebridgeutils_p.h>
Q_LOGGING_CATEGORY(lcQpaAccessibility, "qt.qpa.accessibility") Q_LOGGING_CATEGORY(lcQpaAccessibility, "qt.qpa.accessibility")
// Qt WebAssembly a11y backend // Qt WebAssembly a11y backend
@ -729,3 +732,5 @@ void QWasmAccessibility::onHtmlEventReceived(emscripten::val event)
EMSCRIPTEN_BINDINGS(qtButtonEvent) { EMSCRIPTEN_BINDINGS(qtButtonEvent) {
function("qtEventReceived", &QWasmAccessibility::onHtmlEventReceived); function("qtEventReceived", &QWasmAccessibility::onHtmlEventReceived);
} }
#endif // QT_CONFIG(accessibility)

4
src/plugins/platforms/wasm/qwasmaccessibility.h
View File

@ -4,6 +4,8 @@
#ifndef QWASMACCESIBILITY_H #ifndef QWASMACCESIBILITY_H
#define QWASMACCESIBILITY_H #define QWASMACCESIBILITY_H
#if QT_CONFIG(accessibility)
#include <QtCore/qhash.h> #include <QtCore/qhash.h>
#include <private/qstdweb_p.h> #include <private/qstdweb_p.h>
#include <qpa/qplatformaccessibility.h> #include <qpa/qplatformaccessibility.h>
@ -81,4 +83,6 @@ private:
}; };
#endif // QT_CONFIG(accessibility)
#endif #endif

12
src/plugins/platforms/wasm/qwasmintegration.cpp
View File

@ -76,10 +76,12 @@ EMSCRIPTEN_BINDINGS(qtQWasmIntegraton)
QWasmIntegration *QWasmIntegration::s_instance; QWasmIntegration *QWasmIntegration::s_instance;
QWasmIntegration::QWasmIntegration() QWasmIntegration::QWasmIntegration()
: m_fontDb(nullptr), : m_fontDb(nullptr)
m_desktopServices(nullptr), , m_desktopServices(nullptr)
m_clipboard(new QWasmClipboard), , m_clipboard(new QWasmClipboard)
m_accessibility(new QWasmAccessibility) #if QT_CONFIG(accessibility)
, m_accessibility(new QWasmAccessibility)
#endif
{ {
s_instance = this; s_instance = this;
@ -142,7 +144,9 @@ QWasmIntegration::~QWasmIntegration()
delete m_desktopServices; delete m_desktopServices;
if (m_platformInputContext) if (m_platformInputContext)
delete m_platformInputContext; delete m_platformInputContext;
#if QT_CONFIG(accessibility)
delete m_accessibility; delete m_accessibility;
#endif
for (const auto &elementAndScreen : m_screens) for (const auto &elementAndScreen : m_screens)
elementAndScreen.second->deleteScreen(); elementAndScreen.second->deleteScreen();

4
src/plugins/platforms/wasm/qwasmwindow.cpp
View File

@ -134,7 +134,9 @@ QWasmWindow::~QWasmWindow()
m_compositor->removeWindow(this); m_compositor->removeWindow(this);
if (m_requestAnimationFrameId > -1) if (m_requestAnimationFrameId > -1)
emscripten_cancel_animation_frame(m_requestAnimationFrameId); emscripten_cancel_animation_frame(m_requestAnimationFrameId);
#if QT_CONFIG(accessibility)
QWasmAccessibility::removeAccessibilityEnableButton(window()); QWasmAccessibility::removeAccessibilityEnableButton(window());
#endif
} }
void QWasmWindow::onRestoreClicked() void QWasmWindow::onRestoreClicked()
@ -212,10 +214,12 @@ void QWasmWindow::initialize()
m_normalGeometry = rect; m_normalGeometry = rect;
QPlatformWindow::setGeometry(m_normalGeometry); QPlatformWindow::setGeometry(m_normalGeometry);
#if QT_CONFIG(accessibility)
// Add accessibility-enable button. The user can activate this // Add accessibility-enable button. The user can activate this
// button to opt-in to accessibility. // button to opt-in to accessibility.
if (window()->isTopLevel()) if (window()->isTopLevel())
QWasmAccessibility::addAccessibilityEnableButton(window()); QWasmAccessibility::addAccessibilityEnableButton(window());
#endif
} }
QWasmScreen *QWasmWindow::platformScreen() const QWasmScreen *QWasmWindow::platformScreen() const