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

JNI: pass same QJniEnvironment object to QAndroidPlatformClipboard

Browse Source 
... registerNatives() call.

Change-Id: I42539846249880ed4a215522bdcafb3a2ffa4d14
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Assam Boudjelthia 2023-11-02 11:11:09 +02:00
parent bc8f0911a9
commit 742f45f7cf
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -947,7 +947,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
|| !QtAndroidMenu::registerNatives(env) || !QtAndroidMenu::registerNatives(env)
|| !QtAndroidAccessibility::registerNatives(env) || !QtAndroidAccessibility::registerNatives(env)
|| !QtAndroidDialogHelpers::registerNatives(env) || !QtAndroidDialogHelpers::registerNatives(env)
|| !QAndroidPlatformClipboard::registerNatives()) { || !QAndroidPlatformClipboard::registerNatives(env)) {
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed"); __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
return -1; return -1;
} }

3
src/plugins/platforms/android/qandroidplatformclipboard.cpp
View File

@ -106,9 +106,8 @@ bool QAndroidPlatformClipboard::supportsMode(QClipboard::Mode mode) const
return QClipboard::Clipboard == mode; return QClipboard::Clipboard == mode;
} }
bool QAndroidPlatformClipboard::registerNatives() bool QAndroidPlatformClipboard::registerNatives(QJniEnvironment &env)
{ {
QJniEnvironment env;
bool success = env.registerNativeMethods(Traits<QtClipboardManager>::className(), bool success = env.registerNativeMethods(Traits<QtClipboardManager>::className(),
{ Q_JNI_NATIVE_SCOPED_METHOD(onClipboardDataChanged, QAndroidPlatformClipboard) }); { Q_JNI_NATIVE_SCOPED_METHOD(onClipboardDataChanged, QAndroidPlatformClipboard) });
if (!success) { if (!success) {

2
src/plugins/platforms/android/qandroidplatformclipboard.h
View File

@ -24,7 +24,7 @@ public:
void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override;
bool supportsMode(QClipboard::Mode mode) const override; bool supportsMode(QClipboard::Mode mode) const override;
static bool registerNatives(); static bool registerNatives(QJniEnvironment &env);
private: private:
QMimeData *getClipboardMimeData(); QMimeData *getClipboardMimeData();