Fix shims with PyQt5 5.11 #11500
Merged
Fix shims with PyQt5 5.11 #11500
+26
−30
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sip is not really required by this code when using PyQt5, and 5.11 now no longer requires it nor provides it globally [1]. Also, move the PyQt/PySide shim bits to the end to be near the Qt5/Qt4 shim. [1] http://pyqt.sourceforge.net/Docs/PyQt5/incompatibilities.html#pyqt-v5-11
This fails with PyQt5.11, but is also unnecessary. `_destroying` is set to True before this signal is connected, so the callback simply returns immediately. Thus, just remove the connection entirely.
6 tasks
anntzer
approved these changes
Jun 24, 2018
Contributor
anntzer
left a comment
anntzer
left a comment
There was a problem hiding this comment.
LGTM (the latest pyqt5 release was actually buggy and has been withdrawn, see https://www.riverbankcomputing.com/pipermail/pyqt/2018-June/040459.html, so the build is now unbroken and this can wait for a second reviewer; but in general the PR still looks good).
Contributor
|
Restarted the build to check with the new release of PyQt5.11. |
jklymak
approved these changes
Jul 3, 2018
Member
jklymak
left a comment
jklymak
left a comment
There was a problem hiding this comment.
This passes the tests, so fixes the QT error all the Travis tests are having...
timhoffm
approved these changes
Jul 3, 2018
Member
6 tasks
Member
|
@meeseeksdev backport to v2.2.x |
QuLogic
added a commit
that referenced
this pull request
Jul 4, 2018
…n-v2.2.x Backport PR #11500 on branch v2.2.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Summary
Fix import of PyQt5 5.11.
sip is not really required by this code when using PyQt5, and 5.11 now no longer requires it nor provides it globally [1].
Also, move the PyQt/PySide shim bits to the end to be near the Qt5/Qt4 shim.
[1] http://pyqt.sourceforge.net/Docs/PyQt5/incompatibilities.html#pyqt-v5-11
Remove unnecessary Qt signal connection.
This fails with PyQt5.11, but is also unnecessary.
_destroyingis set to True before this signal is connected, so the callback simply returns immediately. Thus, just remove the connection entirely.PR Checklist