From a4342183199ba9fbd6c86939cf9748e069a09f9c Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Mon, 9 Jan 2023 11:31:28 +0100 Subject: Fix build with -no-accessibility Pick-to: 6.5 Change-Id: I7128608467e4d0ce1b04efa9b82a98f78942d4db Reviewed-by: Allan Sandfeld Jensen --- src/webenginequick/CMakeLists.txt | 6 +++++- src/webenginequick/api/qquickwebengineview.cpp | 7 ++++++- src/webenginequick/api/qquickwebengineview_p_p.h | 1 - src/webenginequick/qquickwebengine_accessible.cpp | 3 --- src/webenginequick/qquickwebengine_accessible.h | 4 ---- src/webenginewidgets/CMakeLists.txt | 6 +++++- src/webenginewidgets/api/qwebengineview.cpp | 5 ++++- src/webenginewidgets/qwebengine_accessible.cpp | 4 ---- src/webenginewidgets/qwebengine_accessible.h | 3 --- .../auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 10 +++++++++- 10 files changed, 29 insertions(+), 20 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 #include +#if QT_CONFIG(accessibility) +#include "qquickwebengine_accessible.h" + +#include +#endif + #if QT_CONFIG(webengine_printing_and_pdf) #include #include 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 #include #include -#include 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(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 #include -#if QT_CONFIG(accessibility) - QT_BEGIN_NAMESPACE class QQuickWebEngineView; @@ -55,6 +53,4 @@ private: }; } // namespace QtWebEngineCore -#endif // QT_CONFIG(accessibility) - #endif // QQUICKWEBENGINE_ACCESSIBLE_H diff --git a/src/webenginewidgets/CMakeLists.txt b/src/webenginewidgets/CMakeLists.txt index f859a774a..f9365adc9 100644 --- a/src/webenginewidgets/CMakeLists.txt +++ b/src/webenginewidgets/CMakeLists.txt @@ -11,7 +11,6 @@ qt_internal_add_module(WebEngineWidgets api/qtwebenginewidgetsglobal.h api/qwebenginenotificationpresenter.cpp api/qwebenginenotificationpresenter_p.h api/qwebengineview.cpp api/qwebengineview.h api/qwebengineview_p.h - qwebengine_accessible.cpp qwebengine_accessible.h ui/autofillpopupwidget.cpp ui/autofillpopupwidget_p.h ui/touchhandlewidget.cpp ui/touchhandlewidget_p.h ui/touchselectionmenuwidget.cpp ui/touchselectionmenuwidget_p.h @@ -35,6 +34,11 @@ qt_internal_add_module(WebEngineWidgets Qt::WebEngineCore ) +qt_internal_extend_target(WebEngineWidgets CONDITION QT_FEATURE_accessibility + SOURCES + qwebengine_accessible.cpp qwebengine_accessible.h +) + qt_internal_extend_target(WebEngineWidgets CONDITION QT_FEATURE_webengine_printing_and_pdf PUBLIC_LIBRARIES Qt::PrintSupport diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index bf975c96f..fd74268f2 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -6,7 +6,6 @@ #include "qwebengineview_p.h" #include "render_widget_host_view_qt_delegate_client.h" #include "render_widget_host_view_qt_delegate_item.h" -#include "qwebengine_accessible.h" #include "ui/autofillpopupwidget_p.h" #include "touchhandlewidget_p.h" #include "touchselectionmenuwidget_p.h" @@ -31,6 +30,10 @@ #include #include +#if QT_CONFIG(accessibility) +#include "qwebengine_accessible.h" +#endif + #if QT_CONFIG(action) #include #endif diff --git a/src/webenginewidgets/qwebengine_accessible.cpp b/src/webenginewidgets/qwebengine_accessible.cpp index 53a812604..6880a5a3a 100644 --- a/src/webenginewidgets/qwebengine_accessible.cpp +++ b/src/webenginewidgets/qwebengine_accessible.cpp @@ -8,8 +8,6 @@ #include "web_contents_adapter.h" -#if QT_CONFIG(accessibility) - QT_BEGIN_NAMESPACE QWebEngineViewAccessible::QWebEngineViewAccessible(QWebEngineView *o) : QAccessibleWidget(o) @@ -102,5 +100,3 @@ QWebEngineViewAccessible *RenderWidgetHostViewQtDelegateWidgetAccessible::viewAc } } // namespace QtWebEngineCore - -#endif // QT_CONFIG(accessibility) diff --git a/src/webenginewidgets/qwebengine_accessible.h b/src/webenginewidgets/qwebengine_accessible.h index c4871784c..f47996cf7 100644 --- a/src/webenginewidgets/qwebengine_accessible.h +++ b/src/webenginewidgets/qwebengine_accessible.h @@ -7,8 +7,6 @@ #include #include -#if QT_CONFIG(accessibility) - QT_BEGIN_NAMESPACE class QWebEngineView; @@ -47,6 +45,5 @@ private: QPointer m_view; }; } // namespace QtWebEngineCore -#endif // QT_CONFIG(accessibility) #endif // QWEBENGINE_ACCESSIBLE_H diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 6e369b4c6..5ae032061 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -69,8 +69,10 @@ private Q_SLOTS: void javascriptClipboard_data(); void javascriptClipboard(); void setProfile(); - void focusChild(); +#if QT_CONFIG(accessibility) void focusChild_data(); + void focusChild(); +#endif void htmlSelectPopup(); private: @@ -1180,6 +1182,7 @@ void tst_QQuickWebEngineView::setProfile() { QTRY_COMPARE(webEngineView()->url() ,urlFromTestPath("html/basic_page2.html")); } +#if QT_CONFIG(accessibility) void tst_QQuickWebEngineView::focusChild_data() { QTest::addColumn("interfaceName"); @@ -1242,6 +1245,7 @@ void tst_QQuickWebEngineView::focusChild() // -> -> QCOMPARE(traverseToWebDocumentAccessibleInterface(iface)->child(0)->child(0), iface->focusChild()); } +#endif // QT_CONFIG(accessibility) void tst_QQuickWebEngineView::htmlSelectPopup() { @@ -1270,8 +1274,12 @@ void tst_QQuickWebEngineView::htmlSelectPopup() QCOMPARE(evaluateJavaScriptSync(&view, "document.getElementById('select').value").toString(), QStringLiteral("O2")); } +#if QT_CONFIG(accessibility) static QByteArrayList params = QByteArrayList() << "--force-renderer-accessibility"; +#else +static QByteArrayList params; +#endif W_QTEST_MAIN(tst_QQuickWebEngineView, params) #include "tst_qquickwebengineview.moc" -- cgit v1.2.3