mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-08-04 22:14:48 +02:00
Diff-minimise
This commit is contained in:
parent
0eeba0aa28
commit
38fc092d97
@ -15,3 +15,4 @@
|
|||||||
QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
|
QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
|
||||||
|
|
||||||
m_javaVM = vm;
|
m_javaVM = vm;
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ and https://bugreports.qt.io/browse/QTBUG-114316
|
|||||||
|
|
||||||
--- a/qtbase/src/corelib/global/qcompilerdetection.h
|
--- a/qtbase/src/corelib/global/qcompilerdetection.h
|
||||||
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
|
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
|
||||||
@@ -1055,16 +1055,22 @@
|
@@ -1050,16 +1050,22 @@
|
||||||
# endif // !_HAS_CONSTEXPR
|
# endif // !_HAS_CONSTEXPR
|
||||||
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
|
||||||
# endif // Q_OS_QNX
|
# endif // Q_OS_QNX
|
||||||
|
13
depends/patches/qt/use_android_ndk23.patch
Normal file
13
depends/patches/qt/use_android_ndk23.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Use Android NDK r23 LTS
|
||||||
|
|
||||||
|
--- old/qtbase/mkspecs/features/android/default_pre.prf
|
||||||
|
+++ new/qtbase/mkspecs/features/android/default_pre.prf
|
||||||
|
@@ -76,7 +76,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
|
||||||
|
else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
|
||||||
|
else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-
|
||||||
|
|
||||||
|
-QMAKE_RANLIB = $${CROSS_COMPILE}ranlib
|
||||||
|
+QMAKE_RANLIB = $$NDK_LLVM_PATH/bin/llvm-ranlib
|
||||||
|
QMAKE_LINK_SHLIB = $$QMAKE_LINK
|
||||||
|
QMAKE_LFLAGS =
|
||||||
|
|
Loading…
Reference in New Issue
Block a user