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 dc480e1a754..c6afdc716db 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 @@ -820,7 +822,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()