diff options
| author | Igor Cota <igor@codexapertus.com> | 2019-10-12 12:49:25 +0200 |
|---|---|---|
| committer | Igor Cota <igor@codexapertus.com> | 2019-10-12 12:49:25 +0200 |
| commit | ed30684d03d3a1d5496e69c488d848fe92ae6fb4 (patch) | |
| tree | 7bbae6c8094a8ea6d2e769495167651423ff56e6 /depends/patches | |
| parent | e4c319e8a1c6e40a953036b942bd5d732b0bbf69 (diff) | |
Qt: patch androidjnimain.cpp to make sure JNI is initialised when statically compiled
Diffstat (limited to 'depends/patches')
| -rw-r--r-- | depends/patches/qt/fix_android_jni_static.patch | 18 |
1 files changed, 18 insertions, 0 deletions
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; + |