diff options
author | Morten Sørvig <[email protected]> | 2023-03-01 13:11:10 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <[email protected]> | 2023-05-02 14:03:24 +0000 |
commit | ae947a2cf197db42852c52318c1721475ff12876 (patch) | |
tree | e23850bc7e9d3e9f8c7b2244220a5c575cfdc0c0 | |
parent | cfea2bd0cddaba5328ca12b071a7ed70031279d4 (diff) |
wasm: build with -no-feature-accessibility
Add #ifdefs around the accessibility implementation.
Fixes: QTBUG-111509
Change-Id: I9a600781b4bf9545f046efa75f962cc40fe196a6
Reviewed-by: Mikołaj Boc <[email protected]>
(cherry picked from commit 3c23d701a777522e96e210e5836bc5803a951d77)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
-rw-r--r-- | src/plugins/platforms/wasm/qwasmaccessibility.cpp | 7 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmaccessibility.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmintegration.cpp | 12 | ||||
-rw-r--r-- | src/plugins/platforms/wasm/qwasmwindow.cpp | 4 |
4 files changed, 22 insertions, 5 deletions
diff --git a/src/plugins/platforms/wasm/qwasmaccessibility.cpp b/src/plugins/platforms/wasm/qwasmaccessibility.cpp index e509f20e0a8..e98b9023c1b 100644 --- a/src/plugins/platforms/wasm/qwasmaccessibility.cpp +++ b/src/plugins/platforms/wasm/qwasmaccessibility.cpp @@ -5,10 +5,13 @@ #include "qwasmscreen.h" #include "qwasmwindow.h" #include "qwasmintegration.h" -#include <QtGui/private/qaccessiblebridgeutils_p.h> #include <QtGui/qwindow.h> +#if QT_CONFIG(accessibility) + +#include <QtGui/private/qaccessiblebridgeutils_p.h> + Q_LOGGING_CATEGORY(lcQpaAccessibility, "qt.qpa.accessibility") // Qt WebAssembly a11y backend @@ -732,3 +735,5 @@ void QWasmAccessibility::onHtmlEventReceived(emscripten::val event) EMSCRIPTEN_BINDINGS(qtButtonEvent) { function("qtEventReceived", &QWasmAccessibility::onHtmlEventReceived); } + +#endif // QT_CONFIG(accessibility) diff --git a/src/plugins/platforms/wasm/qwasmaccessibility.h b/src/plugins/platforms/wasm/qwasmaccessibility.h index dd9770179a3..7582f468ae5 100644 --- a/src/plugins/platforms/wasm/qwasmaccessibility.h +++ b/src/plugins/platforms/wasm/qwasmaccessibility.h @@ -4,6 +4,8 @@ #ifndef QWASMACCESIBILITY_H #define QWASMACCESIBILITY_H +#if QT_CONFIG(accessibility) + #include <QtCore/qhash.h> #include <private/qstdweb_p.h> #include <qpa/qplatformaccessibility.h> @@ -81,4 +83,6 @@ private: }; +#endif // QT_CONFIG(accessibility) + #endif diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index fb04e55ae34..a4b6aece3c0 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -75,10 +75,12 @@ EMSCRIPTEN_BINDINGS(qtQWasmIntegraton) QWasmIntegration *QWasmIntegration::s_instance; QWasmIntegration::QWasmIntegration() - : m_fontDb(nullptr), - m_desktopServices(nullptr), - m_clipboard(new QWasmClipboard), - m_accessibility(new QWasmAccessibility) + : m_fontDb(nullptr) + , m_desktopServices(nullptr) + , m_clipboard(new QWasmClipboard) +#if QT_CONFIG(accessibility) + , m_accessibility(new QWasmAccessibility) +#endif { s_instance = this; @@ -138,7 +140,9 @@ QWasmIntegration::~QWasmIntegration() delete m_desktopServices; if (m_platformInputContext) delete m_platformInputContext; +#if QT_CONFIG(accessibility) delete m_accessibility; +#endif for (const auto &elementAndScreen : m_screens) elementAndScreen.second->deleteScreen(); diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 8b8ce0c656a..336a2a3a3f4 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -134,7 +134,9 @@ QWasmWindow::~QWasmWindow() m_compositor->removeWindow(this); if (m_requestAnimationFrameId > -1) emscripten_cancel_animation_frame(m_requestAnimationFrameId); +#if QT_CONFIG(accessibility) QWasmAccessibility::removeAccessibilityEnableButton(window()); +#endif } void QWasmWindow::onRestoreClicked() @@ -209,10 +211,12 @@ void QWasmWindow::initialize() m_normalGeometry = rect; QPlatformWindow::setGeometry(m_normalGeometry); +#if QT_CONFIG(accessibility) // Add accessibility-enable button. The user can activate this // button to opt-in to accessibility. if (window()->isTopLevel()) QWasmAccessibility::addAccessibilityEnableButton(window()); +#endif } QWasmScreen *QWasmWindow::platformScreen() const |