1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Qt for Android configurable without 'clipboard' support

Browse Source 
Fixes: QTBUG-135675
Pick-to: 6.8
Change-Id: I844cd96f977bd0b5536606cf0c2449a87502231a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 323f408be6bcf5bfa5e2d447be94381556e52a62)
This commit is contained in:
Juha Vuolle 2025-04-07 11:24:25 +03:00
parent c9921d069a
commit 942b23f922
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/android/CMakeLists.txt
View File

@ -21,7 +21,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
qandroideventdispatcher.cpp qandroideventdispatcher.h qandroideventdispatcher.cpp qandroideventdispatcher.h
qandroidinputcontext.cpp qandroidinputcontext.h qandroidinputcontext.cpp qandroidinputcontext.h
qandroidplatformclipboard.cpp qandroidplatformclipboard.h
qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h
qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h
qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h
@ -79,6 +78,11 @@ qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_and
extract-dummy.cpp 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 qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_accessibility
SOURCES SOURCES
androidjniaccessibility.cpp androidjniaccessibility.h androidjniaccessibility.cpp androidjniaccessibility.h

4
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -18,7 +18,9 @@
#include "qandroideventdispatcher.h" #include "qandroideventdispatcher.h"
#include "qandroidplatformdialoghelpers.h" #include "qandroidplatformdialoghelpers.h"
#include "qandroidplatformintegration.h" #include "qandroidplatformintegration.h"
#if QT_CONFIG(clipboard)
#include "qandroidplatformclipboard.h" #include "qandroidplatformclipboard.h"
#endif
#if QT_CONFIG(accessibility) #if QT_CONFIG(accessibility)
#include "androidjniaccessibility.h" #include "androidjniaccessibility.h"
#endif #endif
@ -820,7 +822,9 @@ static bool registerNatives(QJniEnvironment &env)
&& QtAndroidAccessibility::registerNatives(env) && QtAndroidAccessibility::registerNatives(env)
#endif #endif
&& QtAndroidDialogHelpers::registerNatives(env) && QtAndroidDialogHelpers::registerNatives(env)
#if QT_CONFIG(clipboard)
&& QAndroidPlatformClipboard::registerNatives(env) && QAndroidPlatformClipboard::registerNatives(env)
#endif
&& QAndroidPlatformWindow::registerNatives(env) && QAndroidPlatformWindow::registerNatives(env)
&& QtAndroidWindowEmbedding::registerNatives(env) && QtAndroidWindowEmbedding::registerNatives(env)
&& AndroidBackendRegister::registerNatives() && AndroidBackendRegister::registerNatives()