mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-11 20:32:35 -03:00
ef20add4c9
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch release, Qt 5.15.3 does not add any new functionality but provides bug fixes and other improvements. https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md * dropped patches: - patches/qt/dont_use_avx_android_x86_64.patch - patches/qt/fix_bigsur_style.patch * adjusted patches: - patches/qt/fix_android_jni_static.patch - patches/qt/fix_limits_header.patch - patches/qt/use_android_ndk23.patch Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
18 lines
646 B
Diff
18 lines
646 B
Diff
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
|
|
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
|
|
@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
|
|
__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;
|
|
|