mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-27 19:47:30 -03:00
430f319f73
I need to try and patch around Qts buildsystem to keep #21778 moving along (the issue being that even when you tell Qt to build using Clang on Linux, it still calls out to GCC, breaking our ability to have a macOS release build env that doesn't have a GCC toolchain installed, and thus no ld binary). Before trying to patch Qt any further, update to the latest LTS release, and update the current patch set.
17 lines
645 B
Diff
17 lines
645 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;
|