mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
b85fc45a15
8047bb6feaa9ee5d6c1edb7640baaf228450bc6b build: Update `qt` package up to 5.15.11 (Hennadii Stepanov) Pull request description: In the light of https://github.com/bitcoin/bitcoin/pull/28622, we probably have to patch Qt. It seems reasonable to update it up to the latest available version before doing that. ACKs for top commit: TheCharlatan: ACK 8047bb6feaa9ee5d6c1edb7640baaf228450bc6b Tree-SHA512: b4d7df2ff059b8f58c3202d913237c0d39a962748658f1ce853884dca095fbda5f56d4d68f73a1bc8da2f295e96a20927306e148b41a9f4afc42c8edb11c3729
19 lines
646 B
Diff
19 lines
646 B
Diff
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
|
|
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
|
|
@@ -979,6 +979,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;
|
|
|