Commit267d76b

committed

Move QtSvg import to qt_compat

1 parent2a706f8 commit267d76bCopy full SHA for 267d76b

File tree

+26

-8

lines changed

+26

-8

lines changed

Lines changed: 3 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -738,14 +738,9 @@ def _create_pixmap(self, image_path, size, dpr, is_svg=False):`
`738`	`738`
`739`	`739`	`def_render_svg(self,svg_path,pixmap,size,dpr):`
`740`	`740`	`"""Render SVG content to pixmap."""`
`741`		`-ifQT_API=="PyQt5":`
`742`		`-fromPyQt5.QtSvgimportQSvgRenderer`
`743`		`-elifQT_API=="PySide2":`
`744`		`-fromPySide2.QtSvgimportQSvgRenderer`
`745`		`-elifQT_API=="PyQt6":`
`746`		`-fromPyQt6.QtSvgimportQSvgRenderer`
`747`		`-elifQT_API=="PySide6":`
`748`		`-fromPySide6.QtSvgimportQSvgRenderer`
	`741`	`+QSvgRenderer=qt_compat.get_qsvg_renderer()`
	`742`	`+ifQSvgRendererisNone:`
	`743`	`+returnQtGui.QPixmap()`
`749`	`744`
`750`	`745`	`svg_content=svg_path.read_bytes()`
`751`	`746`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -157,3 +157,26 @@ def _isdeleted(obj):`
`157`	`157`	`def_exec(obj):`
`158`	`158`	`# exec on PyQt6, exec_ elsewhere.`
`159`	`159`	`obj.exec()ifhasattr(obj,"exec")elseobj.exec_()`
	`160`	`+`
	`161`	`+`
	`162`	`+defget_qsvg_renderer():`
	`163`	`+"""`
	`164`	`+ Return the QtSvg QSvgRenderer class for the active binding, or None.`
	`165`	`+ """`
	`166`	`+try:`
	`167`	`+ifQT_API==QT_API_PYQT6:`
	`168`	`+fromPyQt6.QtSvgimportQSvgRenderer`
	`169`	`+returnQSvgRenderer`
	`170`	`+elifQT_API==QT_API_PYSIDE6:`
	`171`	`+fromPySide6.QtSvgimportQSvgRenderer`
	`172`	`+returnQSvgRenderer`
	`173`	`+elifQT_API==QT_API_PYQT5:`
	`174`	`+fromPyQt5.QtSvgimportQSvgRenderer`
	`175`	`+returnQSvgRenderer`
	`176`	`+elifQT_API==QT_API_PYSIDE2:`
	`177`	`+fromPySide2.QtSvgimportQSvgRenderer`
	`178`	`+returnQSvgRenderer`
	`179`	`+else:`
	`180`	`+returnNone`
	`181`	`+exceptException:`
	`182`	`+returnNone`

Comments

(0)