From a8b755cde1fb1b1a488b4604e311f5e9b91b9757 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sun, 16 Jan 2022 23:26:15 +0200 Subject: [PATCH 4/6] Android: Disable accessibility as workaround for crash v2 Task-number: QTBUG-95764 Change-Id: I163d27fa7df4b32303fac8bfa473e4d7859735a9 --- src/quick/util/qquickglobal.cpp | 2 +- src/quicktemplates2/qtquicktemplates2global.cpp | 2 +- src/quickwidgets/qquickwidget.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index f869d26280..731e227eb1 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -351,7 +351,7 @@ void QQuick_initializeModule() QQuickItemsModule::defineModule(); -#if QT_CONFIG(accessibility) +#if QT_CONFIG(accessibility) && !defined(Q_OS_ANDROID) QAccessible::installFactory(&qQuickAccessibleFactory); #endif diff --git a/src/quicktemplates2/qtquicktemplates2global.cpp b/src/quicktemplates2/qtquicktemplates2global.cpp index 5100e610bc..33e9b11352 100644 --- a/src/quicktemplates2/qtquicktemplates2global.cpp +++ b/src/quicktemplates2/qtquicktemplates2global.cpp @@ -60,7 +60,7 @@ static QAccessibleInterface *qQuickAccessibleFactory(const QString &classname, Q void QQuickTemplates_initializeModule() { -#if QT_CONFIG(accessibility) +#if QT_CONFIG(accessibility) && !defined(Q_OS_ANDROID) QAccessible::installFactory(&qQuickAccessibleFactory); #endif } diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index e3b7a8da28..b94a28df62 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -193,7 +193,7 @@ void QQuickWidgetPrivate::initOffscreenWindow() QWidget::connect(offscreenWindow, SIGNAL(sceneGraphInvalidated()), q, SLOT(destroyFramebufferObject())); QWidget::connect(offscreenWindow, &QQuickWindow::focusObjectChanged, q, &QQuickWidget::propagateFocusObjectChanged); -#if QT_CONFIG(accessibility) +#if QT_CONFIG(accessibility) && !defined(Q_OS_ANDROID) QAccessible::installFactory(&qAccessibleQuickWidgetFactory); #endif } -- 2.34.1.windows.1