diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-04 10:08:18 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-04 10:08:28 +0800 |
| commit | 7097a63033a34dbcb81a08b6a6269d10fdef2d55 (patch) | |
| tree | 29100ab64ab7ae0cbe5616823658a23ddd10c27c | |
| parent | db5f441408acbcb399e8a4bc6c645dababfcaa6c (diff) | |
| parent | 29e1794ba5350914ea2be8cba33d8d6d2c99760b (diff) | |
| download | bitcoin-7097a63033a34dbcb81a08b6a6269d10fdef2d55.tar.xz | |
Merge bitcoin/bitcoin#23751: build, qt: No need to set inapplicable QPA backend for Android
29e1794ba5350914ea2be8cba33d8d6d2c99760b build, qt: No need to set inapplicable QPA backend for Android (Hennadii Stepanov)
Pull request description:
The current workflow looks weird. At first, the inapplicable `xcb` QPA backend is set in Qt `configure` options. Then the correct `android` QPA backend is forced via the `QT_QPA_PLATFORM` environment variable.
Using the default QPA backend, which is `android` for Android devices, is just fine.
ACKs for top commit:
icota:
re-tACK 29e1794ba5350914ea2be8cba33d8d6d2c99760b
Tree-SHA512: 08ed7d05209c1bedc1a71de5ea3be5d86b40319a164dceb9191f7a4dfe78f2f951778b90421335e73e71a798a57bdf046aa96876762d338b600037bd7ee27b52
| -rw-r--r-- | depends/packages/qt.mk | 1 | ||||
| -rw-r--r-- | src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 7d79129d96..6b71a9abda 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -173,7 +173,6 @@ $(package)_config_opts_android += -android-sdk $(ANDROID_SDK) $(package)_config_opts_android += -android-ndk $(ANDROID_NDK) $(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL) $(package)_config_opts_android += -egl -$(package)_config_opts_android += -qpa xcb $(package)_config_opts_android += -no-dbus $(package)_config_opts_android += -opengl es2 $(package)_config_opts_android += -qt-freetype diff --git a/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java b/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java index cf3b4f6668..2cba489242 100644 --- a/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java +++ b/src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java @@ -18,12 +18,6 @@ public class BitcoinQtActivity extends QtActivity bitcoinDir.mkdir(); } - try { - Os.setenv("QT_QPA_PLATFORM", "android", true); - } catch (ErrnoException e) { - e.printStackTrace(); - } - super.onCreate(savedInstanceState); } } |