Skip to content

Commit

Permalink
DOC: update qt related prose
Browse files Browse the repository at this point in the history
 - added qt5 to backend table
 - updated glossary with new qt urls + qt5
  • Loading branch information
tacaswell committed Aug 14, 2015
1 parent caedbca commit 1b88423
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 3 additions & 1 deletion doc/faq/usage_faq.rst
Expand Up @@ -430,7 +430,8 @@ WXAgg Agg rendering to to a :term:`wxWidgets` canvas
WX Native :term:`wxWidgets` drawing to a :term:`wxWidgets` Canvas
(not recommended) (requires wxPython_)
TkAgg Agg rendering to a :term:`Tk` canvas (requires TkInter_)
Qt4Agg Agg rendering to a :term:`Qt4` canvas (requires PyQt4_)
Qt4Agg Agg rendering to a :term:`Qt4` canvas (requires PyQt4_ or ``pyside``)
Qt5Agg Agg rendering in a :term:`Qt5` canvas (requires PyQt5_)
macosx Cocoa rendering in OSX windows
(presently lacks blocking show() behavior when matplotlib
is in non-interactive mode)
Expand All @@ -448,6 +449,7 @@ macosx Cocoa rendering in OSX windows
.. _wxPython: http://www.wxpython.org/
.. _TkInter: http://wiki.python.org/moin/TkInter
.. _PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
.. _PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro

How do I select PyQt4 or PySide?
========================================
Expand Down
13 changes: 9 additions & 4 deletions doc/glossary/index.rst
Expand Up @@ -91,13 +91,18 @@ Glossary


Qt
`Qt <http://trolltech.com/products/qt/>`__ is a cross-platform
`Qt <http://www.qt.io/>`__ is a cross-platform
application framework for desktop and embedded development.

Qt4
`Qt4 <http://trolltech.com/products/qt/>`__ is the most recent
version of Qt cross-platform application framework for desktop
and embedded development.
`Qt4 <http://doc.qt.io/qt-4.8/index.html>`__ is the previous,
but most widely used, version of Qt cross-platform application
framework for desktop and embedded development.

Qt5
`Qt5 <http://doc.qt.io/qt-5/index.html>`__ is the current
version of Qt cross-platform application
framework for desktop and embedded development.

raster graphics
`Raster graphics
Expand Down

0 comments on commit 1b88423

Please sign in to comment.