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

Drop use of Qt compiled resource file #488

Merged
merged 1 commit into from
Apr 29, 2022

Conversation

bburan
Copy link
Contributor

@bburan bburan commented Apr 7, 2022

PyQt6 no longer supports *.rcc files. Just load the images directly.
Also, switched to QPixmap for rendering the compass rose since that
seems to be the preferred class for on-screen rendering.

Fixes #487

PyQt6 no longer supports *.rcc files. Just load the images directly.
Also, switched to QPixmap for rendering the compass rose since that
seems to be the preferred class for on-screen rendering.
@codecov-commenter
Copy link

codecov-commenter commented Apr 7, 2022

Codecov Report

Merging #488 (9097f1c) into main (e97409a) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main     #488      +/-   ##
==========================================
- Coverage   73.16%   73.15%   -0.02%     
==========================================
  Files         317      316       -1     
  Lines       24125    24115      -10     
  Branches       55       55              
==========================================
- Hits        17652    17642      -10     
  Misses       6473     6473              

@MatthieuDartiailh
Copy link
Member

Nice ! I do not get why we see a segfault after pytest complete on 3.10 with pyside 6 on Linux. It is unrelated to this changes and should not block merging this.

@MatthieuDartiailh
Copy link
Member

#486 managed to pass at least once. Hopefully it fixes the issue (I restarted the build to see if it keeps on passing).

@MatthieuDartiailh
Copy link
Member

It does not... I feel we will have to live with this one for some time except if somebody can debug locally (I personally don't have the bandwidth too). @bburan is this and #486 ready to go and do you have any other fixes pending ?

@bburan
Copy link
Contributor Author

bburan commented Apr 8, 2022

@MatthieuDartiailh I also don't have the bandwidth to debug the pyside issue. This is likely a problem in the pyside library, but can't say for sure. I don't have any additional Qt6 fixes pending at the moment. I think both #486 and this one are ready to go.

@MatthieuDartiailh MatthieuDartiailh merged commit 1a7d9c9 into nucleic:main Apr 29, 2022
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.

Dock Area resource file needs to be fixed for Qt6
3 participants