Skip to content
This repository has been archived by the owner on Jun 5, 2019. It is now read-only.

Fix Qt5/4 import strategy. #315

Merged
merged 1 commit into from
Oct 4, 2018
Merged

Fix Qt5/4 import strategy. #315

merged 1 commit into from
Oct 4, 2018

Conversation

jhoenicke
Copy link
Contributor

  • Try Qt5 before Qt4.
  • Handle all exceptions (a ValueError is thrown if the wrong Qt was imported earlier)

@jhoenicke
Fix Qt5/4 import strategy.
71f2433 
- Try Qt5 before Qt4.
- Handle all exceptions (a ValueError is thrown if the wrong Qt was
  imported earlier)
@jhoenicke
Copy link
Contributor Author

This fixes this bug with electrum:

  File "/home/hoenicke/.local/lib/python3.6/site-packages/trezorlib/qt/pinmatrix.py", line 21, in <module>
    from PyQt4.QtGui import (
ValueError: PyCapsule_GetPointer called with incorrect name

@matejcik matejcik merged commit b4c5b99 into trezor:master Oct 4, 2018
@matejcik matejcik added this to the next milestone Oct 4, 2018
@matejcik
Copy link
Contributor

matejcik commented Oct 4, 2018

looks good, thanks

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v0.11
Development

Successfully merging this pull request may close these issues.
2 participants
@jhoenicke @matejcik