Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fix checking of X11 builds with PySide2. #16845

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 20, 2020
Merged

Fix checking of X11 builds with PySide2. #16845

merged 1 commit into from
Mar 20, 2020

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Mar 19, 2020

Import QtX11Extras from PySide2 instead of PyQt5 if we're otherwise
already using PySide2.

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@anntzer
Fix checking of X11 builds with PySide2.
fdf796e 
Import QtX11Extras from PySide2 instead of PyQt5 if we're otherwise
already using PySide2.
@anntzer anntzer added this to the v3.3.0 milestone Mar 19, 2020
@timhoffm timhoffm merged commit 7b745ad into matplotlib:master Mar 20, 2020
@anntzer anntzer deleted the pyside2_x11 branch March 20, 2020 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic approved these changes

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
GUI: Qt
Projects
None yet
Milestone
v3.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@anntzer @QuLogic @timhoffm
Morty Proxy This is a proxified and sanitized view of the page, visit original site.