From ed30684d03d3a1d5496e69c488d848fe92ae6fb4 Mon Sep 17 00:00:00 2001 From: Igor Cota Date: Sat, 12 Oct 2019 12:49:25 +0200 Subject: Qt: patch androidjnimain.cpp to make sure JNI is initialised when statically compiled --- depends/patches/qt/fix_android_jni_static.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 depends/patches/qt/fix_android_jni_static.patch (limited to 'depends/patches') diff --git a/depends/patches/qt/fix_android_jni_static.patch b/depends/patches/qt/fix_android_jni_static.patch new file mode 100644 index 0000000000..2f6ff00f40 --- /dev/null +++ b/depends/patches/qt/fix_android_jni_static.patch @@ -0,0 +1,18 @@ +--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp ++++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp +@@ -890,6 +890,14 @@ + __android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed"); + return -1; + } ++ ++ const jint ret = QT_PREPEND_NAMESPACE(QtAndroidPrivate::initJNI(vm, env)); ++ if (ret != 0) ++ { ++ __android_log_print(ANDROID_LOG_FATAL, "Qt", "initJNI failed"); ++ return ret; ++ } ++ + QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false); + + m_javaVM = vm; + -- cgit v1.2.3