Skip to content

Commit 7097a63

Browse files
committed
Merge bitcoin/bitcoin#23751: build, qt: No need to set inapplicable QPA backend for Android
29e1794 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 29e1794 Tree-SHA512: 08ed7d05209c1bedc1a71de5ea3be5d86b40319a164dceb9191f7a4dfe78f2f951778b90421335e73e71a798a57bdf046aa96876762d338b600037bd7ee27b52
2 parents db5f441 + 29e1794 commit 7097a63

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

depends/packages/qt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ $(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
173173
$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
174174
$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
175175
$(package)_config_opts_android += -egl
176-
$(package)_config_opts_android += -qpa xcb
177176
$(package)_config_opts_android += -no-dbus
178177
$(package)_config_opts_android += -opengl es2
179178
$(package)_config_opts_android += -qt-freetype

src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ public void onCreate(Bundle savedInstanceState)
1818
bitcoinDir.mkdir();
1919
}
2020

21-
try {
22-
Os.setenv("QT_QPA_PLATFORM", "android", true);
23-
} catch (ErrnoException e) {
24-
e.printStackTrace();
25-
}
26-
2721
super.onCreate(savedInstanceState);
2822
}
2923
}

0 commit comments

Comments
 (0)