diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-09 11:31:28 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-09 12:40:11 +0100 |
| commit | a4342183199ba9fbd6c86939cf9748e069a09f9c (patch) | |
| tree | e26911562884ec6e72914da54065b0d67b96e516 /src/webenginequick | |
| parent | 31347bd61ee67c1f680dbd1d5bcdf74861b7fae1 (diff) | |
Fix build with -no-accessibility
Pick-to: 6.5
Change-Id: I7128608467e4d0ce1b04efa9b82a98f78942d4db
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 7 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview_p_p.h | 1 | ||||
| -rw-r--r-- | src/webenginequick/qquickwebengine_accessible.cpp | 3 | ||||
| -rw-r--r-- | src/webenginequick/qquickwebengine_accessible.h | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index fd40081e9..0081edb7f 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -37,7 +37,6 @@ qt_internal_add_qml_module(WebEngineQuick api/qquickwebengineforeigntypes_p.h api/qtwebenginequickglobal.cpp api/qtwebenginequickglobal.h api/qtwebenginequickglobal_p.h - qquickwebengine_accessible.cpp qquickwebengine_accessible.h render_widget_host_view_qt_delegate_quickwindow.cpp render_widget_host_view_qt_delegate_quickwindow.h ui_delegates_manager.cpp ui_delegates_manager.h DEFINES @@ -58,6 +57,11 @@ qt_internal_add_qml_module(WebEngineQuick Qt::WebEngineCore ) +qt_internal_extend_target(WebEngineQuick CONDITION QT_FEATURE_accessibility + SOURCES + qquickwebengine_accessible.cpp qquickwebengine_accessible.h +) + qt_internal_extend_target(qtwebenginequickplugin SOURCES plugin.cpp diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 94ddd4579..9eb8a1e2a 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -24,7 +24,6 @@ #include "file_picker_controller.h" #include "find_text_helper.h" #include "javascript_dialog_controller.h" -#include "qquickwebengine_accessible.h" #include "render_widget_host_view_qt_delegate_item.h" #include "render_widget_host_view_qt_delegate_quickwindow.h" #include "touch_selection_menu_controller.h" @@ -58,6 +57,12 @@ #include <QtQml/qqmlengine.h> #include <QtQml/qqmlproperty.h> +#if QT_CONFIG(accessibility) +#include "qquickwebengine_accessible.h" + +#include <QtGui/qaccessible.h> +#endif + #if QT_CONFIG(webengine_printing_and_pdf) #include <QtCore/qmargins.h> #include <QtGui/qpagelayout.h> diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h index b696e0218..aa67fd291 100644 --- a/src/webenginequick/api/qquickwebengineview_p_p.h +++ b/src/webenginequick/api/qquickwebengineview_p_p.h @@ -27,7 +27,6 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qstring.h> -#include <QtGui/qaccessibleobject.h> namespace QtWebEngineCore { class RenderWidgetHostViewQtDelegateItem; diff --git a/src/webenginequick/qquickwebengine_accessible.cpp b/src/webenginequick/qquickwebengine_accessible.cpp index 80e2adbbd..2941f01b5 100644 --- a/src/webenginequick/qquickwebengine_accessible.cpp +++ b/src/webenginequick/qquickwebengine_accessible.cpp @@ -10,8 +10,6 @@ #include "api/qquickwebengineview_p_p.h" #include "web_contents_adapter.h" - -#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE QQuickWebEngineViewAccessible::QQuickWebEngineViewAccessible(QQuickWebEngineView *o) : QAccessibleObject(o) @@ -147,4 +145,3 @@ QQuickWebEngineViewAccessible *RenderWidgetHostViewQtDelegateQuickAccessible::vi return static_cast<QQuickWebEngineViewAccessible *>(QAccessible::queryAccessibleInterface(m_view)); } } // namespace QtWebEngineCore -#endif // QT_CONFIG(accessibility) diff --git a/src/webenginequick/qquickwebengine_accessible.h b/src/webenginequick/qquickwebengine_accessible.h index b1a4a34f5..479de9789 100644 --- a/src/webenginequick/qquickwebengine_accessible.h +++ b/src/webenginequick/qquickwebengine_accessible.h @@ -7,8 +7,6 @@ #include <QtCore/qpointer.h> #include <QtGui/qaccessibleobject.h> -#if QT_CONFIG(accessibility) - QT_BEGIN_NAMESPACE class QQuickWebEngineView; @@ -55,6 +53,4 @@ private: }; } // namespace QtWebEngineCore -#endif // QT_CONFIG(accessibility) - #endif // QQUICKWEBENGINE_ACCESSIBLE_H |