summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Vuolle <[email protected]>2025-04-07 11:24:25 +0300
committerJuha Vuolle <[email protected]>2025-04-24 07:03:32 +0300
commit323f408be6bcf5bfa5e2d447be94381556e52a62 (patch)
treeae27f5f456f6006c8a2613be02054f397389f506
parentf5b5f16bfa0bf0889c1d77af3e9840e67a2e851c (diff)
Make Qt for Android configurable without 'clipboard' support
Fixes: QTBUG-135675 Pick-to: 6.9 6.8 Change-Id: I844cd96f977bd0b5536606cf0c2449a87502231a Reviewed-by: Assam Boudjelthia <[email protected]>
-rw-r--r--src/plugins/platforms/android/CMakeLists.txt6
-rw-r--r--src/plugins/platforms/android/androidjnimain.cpp4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index 72ac93609f1..b42f84a6107 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
qandroideventdispatcher.cpp qandroideventdispatcher.h
qandroidinputcontext.cpp qandroidinputcontext.h
- qandroidplatformclipboard.cpp qandroidplatformclipboard.h
qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h
qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h
qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h
@@ -79,6 +78,11 @@ qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_and
extract-dummy.cpp
)
+qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_clipboard
+ SOURCES
+ qandroidplatformclipboard.cpp qandroidplatformclipboard.h
+)
+
qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_accessibility
SOURCES
androidjniaccessibility.cpp androidjniaccessibility.h
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index a2669ffc3a1..bb8e6838220 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -18,7 +18,9 @@
#include "qandroideventdispatcher.h"
#include "qandroidplatformdialoghelpers.h"
#include "qandroidplatformintegration.h"
+#if QT_CONFIG(clipboard)
#include "qandroidplatformclipboard.h"
+#endif
#if QT_CONFIG(accessibility)
#include "androidjniaccessibility.h"
#endif
@@ -791,7 +793,9 @@ static bool registerNatives(QJniEnvironment &env)
&& QtAndroidAccessibility::registerNatives(env)
#endif
&& QtAndroidDialogHelpers::registerNatives(env)
+#if QT_CONFIG(clipboard)
&& QAndroidPlatformClipboard::registerNatives(env)
+#endif
&& QAndroidPlatformWindow::registerNatives(env)
&& QtAndroidWindowEmbedding::registerNatives(env)
&& AndroidBackendRegister::registerNatives()