File tree Expand file tree Collapse file tree 2 files changed +14
-7
lines changed
Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -430,7 +430,8 @@ WXAgg Agg rendering to to a :term:`wxWidgets` canvas
430430WX Native :term: `wxWidgets ` drawing to a :term: `wxWidgets ` Canvas
431431 (not recommended) (requires wxPython _)
432432TkAgg Agg rendering to a :term: `Tk ` canvas (requires TkInter _)
433- Qt4Agg Agg rendering to a :term: `Qt4 ` canvas (requires PyQt4 _)
433+ Qt4Agg Agg rendering to a :term: `Qt4 ` canvas (requires PyQt4 _ or ``pyside ``)
434+ Qt5Agg Agg rendering in a :term: `Qt5 ` canvas (requires PyQt5 _)
434435macosx Cocoa rendering in OSX windows
435436 (presently lacks blocking show() behavior when matplotlib
436437 is in non-interactive mode)
@@ -448,6 +449,7 @@ macosx Cocoa rendering in OSX windows
448449.. _wxPython : http://www.wxpython.org/
449450.. _TkInter : http://wiki.python.org/moin/TkInter
450451.. _PyQt4 : http://www.riverbankcomputing.co.uk/software/pyqt/intro
452+ .. _PyQt5 : http://www.riverbankcomputing.co.uk/software/pyqt/intro
451453
452454How do I select PyQt4 or PySide?
453455========================================
Original file line number Diff line number Diff line change @@ -73,9 +73,9 @@ Glossary
7373 pyqt
7474 `pyqt <http://wiki.python.org/moin/PyQt >`_ provides python
7575 wrappers for the :term: `Qt ` widgets library and is required by
76- the matplotlib QtAgg and Qt4Agg backends. Widely used on linux
76+ the matplotlib Qt5Agg and Qt4Agg backends. Widely used on linux
7777 and windows; many linux distributions package this as
78- 'python-qt3 ' or 'python-qt4'.
78+ 'python-qt5 ' or 'python-qt4'.
7979
8080 python
8181 `python <http://python.org >`_ is an object oriented interpreted
@@ -91,13 +91,18 @@ Glossary
9191
9292
9393 Qt
94- `Qt <http://trolltech.com/products/qt / >`__ is a cross-platform
94+ `Qt <http://www.qt.io / >`__ is a cross-platform
9595 application framework for desktop and embedded development.
9696
9797 Qt4
98- `Qt4 <http://trolltech.com/products/qt/ >`__ is the most recent
99- version of Qt cross-platform application framework for desktop
100- and embedded development.
98+ `Qt4 <http://doc.qt.io/qt-4.8/index.html >`__ is the previous,
99+ but most widely used, version of Qt cross-platform application
100+ framework for desktop and embedded development.
101+
102+ Qt5
103+ `Qt5 <http://doc.qt.io/qt-5/index.html >`__ is the current
104+ version of Qt cross-platform application
105+ framework for desktop and embedded development.
101106
102107 raster graphics
103108 `Raster graphics
You can’t perform that action at this time.
0 commit comments