mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
db82ecbefe
6988a2f097e9af50e1b4222550b2593bfc5685ea build: Update qt package up to 5.15.10 (Hennadii Stepanov) Pull request description: The Qt 5.15.10 contains at least three important for us fixes: -8bb90ab760, which allows us to drop the [`dont_hardcode_x86_64.patch`](fd8ab08558/depends/patches/qt/dont_hardcode_x86_64.patch) -8467beddb7, which allows us to drop the [`fix_montery_include.patch`](fd8ab08558/depends/patches/qt/fix_montery_include.patch) -df08a21fa4, which addresses https://github.com/bitcoin/bitcoin/pull/28349#issuecomment-1743519614 ACKs for top commit: fanquake: ACK 6988a2f097e9af50e1b4222550b2593bfc5685ea. Tree-SHA512: 838c44cf0d7508714f35887bb1f0983e59d96764f08f467bbd03d102d7152e797daeedc178afb03141115cc3be623e4ef7c4c4c65c0a8d1f0bb9702c9a6f8fc6
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
|
|
@@ -980,6 +980,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;
|
|
|