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

Implement backend for PyQt5 + modify Qt4 backends to use Qt5 module via shim #3072

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

Merged
merged 5 commits into from
Jun 27, 2014
Merged

Implement backend for PyQt5 + modify Qt4 backends to use Qt5 module via shim #3072

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4347da0
Implement backend for PyQt5 + modify Qt4 backend to Qt5 structure.
May 18, 2014
c9bf9ec
Fix problems identified in pull-request review
May 19, 2014
c98406d
Fix setupext.py for the case where both PyQt4 and PyQt5 are installed
May 20, 2014
1700282
BackendPySide using multiprocessing + added to setup.py
May 20, 2014
3779fab
Fix error on pyplot initialisation in IPython
Jun 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix error on pyplot initialisation in IPython 
There was a bug on the pyplot initialisation that was wrongly looking for qApp in
PyQt5.QtGui rather than PyQt5.QtWidgets. I've updated the init to do this
correctly, which hopefully fixes the bug reported by @tacaswell
  • Loading branch information
Martin Fitzpatrick committed Jun 23, 2014
commit 3779fab61ea0d30b3fe953bc6e187b20691e9060
4 changes: 2 additions & 2 deletions 4 lib/matplotlib/pyplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def _backend_selection():
# The mainloop is running.
rcParams['backend'] = 'qt4Agg'
elif 'PyQt5.QtCore' in sys.modules and not backend == 'Qt5Agg':
import PyQt5.QtGui
if not PyQt5.QtGui.qApp.startingUp():
import PyQt5.QtWidgets
if not PyQt5.QtWidgets.qApp.startingUp():
# The mainloop is running.
rcParams['backend'] = 'qt5Agg'
elif 'gtk' in sys.modules and not backend in ('GTK', 'GTKAgg',
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.