diff options
| author | Juha Vuolle <juha.vuolle@qt.io> | 2025-04-07 13:39:34 +0300 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@qt.io> | 2025-04-24 07:03:22 +0300 |
| commit | f5b5f16bfa0bf0889c1d77af3e9840e67a2e851c (patch) | |
| tree | f7d3f55b7c60953282b5add1ee86285c9983f01c /src/plugins/platforms/android/androidjnimain.cpp | |
| parent | 965af8548cb804a0edb13ce167bd9daae0da3ed0 (diff) | |
Make Qt for Android configurable without 'accessibility' support
The code was already partially behind the feature flag, but not fully.
Pick-to: 6.9 6.8
Fixes: QTBUG-135693
Change-Id: Iad76221837aa37b90b3be998afc41ce9bbc05c55
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/androidjnimain.cpp')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 59b389b7708..a2669ffc3a1 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -10,7 +10,6 @@ #include "androidcontentfileengine.h" #include "qandroidapkfileengine.h" #include "androiddeadlockprotector.h" -#include "androidjniaccessibility.h" #include "androidjniinput.h" #include "androidjnimain.h" #include "androidjnimenu.h" @@ -20,6 +19,9 @@ #include "qandroidplatformdialoghelpers.h" #include "qandroidplatformintegration.h" #include "qandroidplatformclipboard.h" +#if QT_CONFIG(accessibility) +#include "androidjniaccessibility.h" +#endif #include "qandroidplatformscreen.h" #include "qandroidplatformwindow.h" @@ -88,7 +90,9 @@ static const char m_methodErrorMsg[] = "Can't find method \"%s%s\""; Q_CONSTINIT static QBasicAtomicInt startQtAndroidPluginCalled = Q_BASIC_ATOMIC_INITIALIZER(0); +#if QT_CONFIG(accessibility) Q_DECLARE_JNI_CLASS(QtAccessibilityInterface, "org/qtproject/qt/android/QtAccessibilityInterface"); +#endif namespace QtAndroid { @@ -174,6 +178,7 @@ namespace QtAndroid return true; } +#if QT_CONFIG(accessibility) void initializeAccessibility() { m_backendRegister->callInterface<QtJniTypes::QtAccessibilityInterface, void>( @@ -215,6 +220,7 @@ namespace QtAndroid m_backendRegister->callInterface<QtJniTypes::QtAccessibilityInterface, void>( "notifyScrolledEvent", accessibilityObjectId); } +#endif //QT_CONFIG(accessibility) void notifyNativePluginIntegrationReady(bool ready) { @@ -781,7 +787,9 @@ static bool registerNatives(QJniEnvironment &env) success = success && QtAndroidInput::registerNatives(env) && QtAndroidMenu::registerNatives(env) +#if QT_CONFIG(accessibility) && QtAndroidAccessibility::registerNatives(env) +#endif && QtAndroidDialogHelpers::registerNatives(env) && QAndroidPlatformClipboard::registerNatives(env) && QAndroidPlatformWindow::registerNatives(env) |