Commit2ff12fb

committed

Merge pull request#4922 from tacaswell/doc_qt5

DOC: update qt related prose

2 parentscaedbca +2bb832c commit2ff12fbCopy full SHA for 2ff12fb

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -430,7 +430,8 @@ WXAgg Agg rendering to to a :term:`wxWidgets` canvas
`430`	`430`	WX Native:term:`wxWidgets` drawing to a:term:`wxWidgets` Canvas
`431`	`431`	`(not recommended) (requireswxPython_)`
`432`	`432`	TkAgg Agg rendering to a:term:`Tk` canvas (requiresTkInter_)
`433`		-Qt4Agg Agg rendering to a:term:`Qt4` canvas (requiresPyQt4_)
	`433`	+Qt4Agg Agg rendering to a:term:`Qt4` canvas (requiresPyQt4_ or ``pyside``)
	`434`	+Qt5Agg Agg rendering in a:term:`Qt5` canvas (requiresPyQt5_)
`434`	`435`	`macosx Cocoa rendering in OSX windows`
`435`	`436`	`(presently lacks blocking show() behavior when matplotlib`
`436`	`437`	`is in non-interactive mode)`
`@@ -448,6 +449,7 @@ macosx Cocoa rendering in OSX windows`
`448`	`449`	`.. _wxPython:http://www.wxpython.org/`
`449`	`450`	`.. _TkInter:http://wiki.python.org/moin/TkInter`
`450`	`451`	`.. _PyQt4:http://www.riverbankcomputing.co.uk/software/pyqt/intro`
	`452`	`+.. _PyQt5:http://www.riverbankcomputing.co.uk/software/pyqt/intro`
`451`	`453`
`452`	`454`	`How do I select PyQt4 or PySide?`
`453`	`455`	`========================================`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ Glossary`
`73`	`73`	`pyqt`
`74`	`74`	`pyqt<http://wiki.python.org/moin/PyQt>`_ provides python
`75`	`75`	wrappers for the:term:`Qt` widgets library and is required by
`76`		`- the matplotlibQtAgg and Qt4Agg backends. Widely used on linux`
	`76`	`+ the matplotlibQt5Agg and Qt4Agg backends. Widely used on linux`
`77`	`77`	`and windows; many linux distributions package this as`
`78`		`- 'python-qt3' or 'python-qt4'.`
	`78`	`+ 'python-qt5' or 'python-qt4'.`
`79`	`79`
`80`	`80`	`python`
`81`	`81`	`python<http://python.org>`_ is an object oriented interpreted
`@@ -91,13 +91,18 @@ Glossary`
`91`	`91`
`92`	`92`
`93`	`93`	`Qt`
`94`		- `Qt<http://trolltech.com/products/qt/>`__ is a cross-platform
	`94`	+ `Qt<http://www.qt.io/>`__ is a cross-platform
`95`	`95`	`application framework for desktop and embedded development.`
`96`	`96`
`97`	`97`	`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.`
`101`	`106`
`102`	`107`	`raster graphics`
`103`	`108`	`Raster graphics

Comments

(0)