diff options
author | Anu Aliyas <anu.aliyas@qt.io> | 2023-12-08 12:06:47 +0100 |
---|---|---|
committer | Anu Aliyas <anu.aliyas@qt.io> | 2023-12-14 18:12:57 +0100 |
commit | 39e437f0bc990cf292defff0d77790d27b31df32 (patch) | |
tree | 22dd2b88d6774bcf52481458c4e24dfeb6c7406f | |
parent | 075d57c6d1ef9377c1d5c78af86ef5bc889b320b (diff) |
Fix compilation error with -no-feature-accessibility option
- At present, there is no option to disable accessibility in Chromium during build time.
- Added the missing definition for BrowserAccessibility::Create() to resolve the compilation issue.
- This approach is similar to the BrowserAccessibilityManager::Create() function.
Fixes: QTBUG-119789
Pick-to: 6.7 6.6 6.5
Change-Id: I87a0a3653fa18aa3d32d5620a18f89e9403c92ab
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/core/browser_accessibility_qt.cpp | 10 | ||||
-rw-r--r-- | src/core/browser_accessibility_qt.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 699ed227d..638ee483a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -78,6 +78,7 @@ foreach(arch ${archs}) ${gnCxxCompileOptions} SOURCES accessibility_tree_formatter_qt.cpp + browser_accessibility_qt.cpp browser_accessibility_qt.h authentication_dialog_controller.cpp authentication_dialog_controller.h authentication_dialog_controller_p.h autofill_client_qt.cpp autofill_client_qt.h autofill_popup_controller.cpp autofill_popup_controller.h autofill_popup_controller_p.h @@ -203,7 +204,6 @@ foreach(arch ${archs}) extend_gn_target(${buildGn} CONDITION QT_FEATURE_accessibility SOURCES accessibility_activation_observer.cpp accessibility_activation_observer.h - browser_accessibility_qt.cpp browser_accessibility_qt.h ) extend_gn_target(${buildGn} CONDITION QT_FEATURE_webengine_ozone_x11 diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp index 4b8e947c0..de3347df3 100644 --- a/src/core/browser_accessibility_qt.cpp +++ b/src/core/browser_accessibility_qt.cpp @@ -10,6 +10,7 @@ #include "qtwebenginecoreglobal_p.h" #include "type_conversion.h" +#if QT_CONFIG(accessibility) #include "content/browser/accessibility/browser_accessibility.h" #include "ui/accessibility/ax_enums.mojom.h" @@ -1151,14 +1152,22 @@ void BrowserAccessibilityInterface::modelChange(QAccessibleTableModelChangeEvent } // namespace QtWebEngineCore +#endif // QT_CONFIG(accessibility) namespace content { // static std::unique_ptr<BrowserAccessibility> BrowserAccessibility::Create(BrowserAccessibilityManager *man, ui::AXNode *node) { +#if QT_CONFIG(accessibility) return std::unique_ptr<BrowserAccessibility>(new QtWebEngineCore::BrowserAccessibilityQt(man, node)); +#else + Q_UNUSED(man); + Q_UNUSED(node); + return nullptr; +#endif // #if QT_CONFIG(accessibility) } +#if QT_CONFIG(accessibility) QAccessibleInterface *toQAccessibleInterface(BrowserAccessibility *obj) { return static_cast<QtWebEngineCore::BrowserAccessibilityQt *>(obj)->interface; @@ -1168,5 +1177,6 @@ const QAccessibleInterface *toQAccessibleInterface(const BrowserAccessibility *o { return static_cast<const QtWebEngineCore::BrowserAccessibilityQt *>(obj)->interface; } +#endif // #if QT_CONFIG(accessibility) } // namespace content diff --git a/src/core/browser_accessibility_qt.h b/src/core/browser_accessibility_qt.h index 455478247..598aa3ef5 100644 --- a/src/core/browser_accessibility_qt.h +++ b/src/core/browser_accessibility_qt.h @@ -4,8 +4,9 @@ #ifndef BROWSER_ACCESSIBILITY_QT_H #define BROWSER_ACCESSIBILITY_QT_H -#include <QtCore/qtconfigmacros.h> +#include <QtGui/qtguiglobal.h> +#if QT_CONFIG(accessibility) QT_FORWARD_DECLARE_CLASS(QAccessibleInterface) namespace content { @@ -15,5 +16,6 @@ QAccessibleInterface *toQAccessibleInterface(BrowserAccessibility *obj); const QAccessibleInterface *toQAccessibleInterface(const BrowserAccessibility *obj); } // namespace content +#endif // QT_CONFIG(accessibility) #endif // BROWSER_ACCESSIBILITY_QT_H |