Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt6 #8545

Merged
merged 22 commits into from
Nov 9, 2023
Merged

Qt6 #8545

merged 22 commits into from
Nov 9, 2023

Conversation

accumulator
Copy link
Member

@accumulator accumulator commented Jul 19, 2023

Currently builds a working APK using buildozer HEAD and python-for-android HEAD plus a patchset for qt6 bootstrap and pyqt6.

Builds against API 31, NDK 23c

Additional notes:

  • build container name temporarily renamed so it's easier to switch between current qt5 and this qt6 build
  • bootstrap now requires a native qt6 build in order to provide tooling and cmake files for android target. This currently cannot be done using distribution provided qt6. This will increase build time.
  • the p4a patchset disables NDK version check, as qt6.4.3 officially supports NDK23, while p4a demands NDK25. I've encountered no obvious problems with using NDK23
  • when testing on desktop, note that Pillow dependency is upped to 8.4.0 for PyQt6 support

Issues

  • Camera is unstable in Qt 6.4 and 6.5. Resolved for now, by using SimpleScannerActivity on android platform.
  • UI doesn't always resize correctly in case the keyboard is visible.

SomberNight added a commit that referenced this pull request Aug 30, 2023
@SomberNight SomberNight mentioned this pull request Aug 30, 2023
@ecdsa ecdsa added this to the 4.5.0 milestone Sep 7, 2023
@accumulator
Copy link
Member Author

accumulator commented Oct 31, 2023

removing Draft status, as there are currently no open issues and this PR can be reviewed as is.

before considering merging, the build container name change commit should be removed first.

@accumulator accumulator marked this pull request as ready for review October 31, 2023 15:00
accumulator and others added 4 commits November 7, 2023 10:32
turns out that Qt.inputMethod.keyboardRectangle.height is not suitable for calculating the exact keyboard
dimensions in Qt coordinates. Instead, use Qt.inputMethod.keyboardRectangle.y transformed to Qt coordinates
using Screen.devicePixelRatio

Note: Qt.inputMethod.keyboardRectangle stop being updated after exiting FLAG_SECURE state
(e.g. in seed or master key entry pages)
@accumulator
Copy link
Member Author

accumulator commented Nov 7, 2023

rebased and removed the commit changing the qt6 specific build image name, so this PR should be ready to merge.

(build container name change parked in https://github.com/accumulator/electrum/tree/qt6-tmp if you need it)

Copy link
Member

@SomberNight SomberNight left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tried to review and test this now (at commit 047cc6f), and to me it looks good.
Thank you very much for this work.

@SomberNight SomberNight merged commit 5ba156f into spesmilo:master Nov 9, 2023
14 checks passed
@accumulator accumulator deleted the qt6 branch November 10, 2023 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants