Commit6488491

committed

qt: Avoid setting Qt5 attributes on Qt6

In some versions, this appears to emit a deprecation warning, so don'teven attempt it.

1 parenta09ddb8 commit6488491Copy full SHA for 6488491

File tree

-9

lines changed

-9

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,10 @@ def _create_qApp():`
`106`	`106`	`# of Qt is not instantiated in the process`
`107`	`107`	`ifQT_APIin {'PyQt6','PySide6'}:`
`108`	`108`	`other_bindings= ('PyQt5','PySide2')`
	`109`	`+qt_version=6`
`109`	`110`	`elifQT_APIin {'PyQt5','PySide2'}:`
`110`	`111`	`other_bindings= ('PyQt6','PySide6')`
	`112`	`+qt_version=5`
`111`	`113`	`else:`
`112`	`114`	`raiseRuntimeError("Should never be here")`
`113`	`115`
`@@ -123,11 +125,11 @@ def _create_qApp():`
`123`	`125`	`'versions may not work as expected.'`
`124`	`126`	`)`
`125`	`127`	`break`
`126`		`-try:`
`127`		`-QtWidgets.QApplication.setAttribute(`
`128`		`-QtCore.Qt.AA_EnableHighDpiScaling)`
`129`		`-exceptAttributeError:# Only for Qt>=5.6, <6.`
`130`		`-pass`
	`128`	`+ifqt_version==5:`
	`129`	`+try:`
	`130`	`+QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)`
	`131`	`+exceptAttributeError:# Only for Qt>=5.6, <6.`
	`132`	`+pass`
`131`	`133`	`try:`
`132`	`134`	`QtWidgets.QApplication.setHighDpiScaleFactorRoundingPolicy(`
`133`	`135`	`QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)`
`@@ -141,10 +143,8 @@ def _create_qApp():`
`141`	`143`	`app.lastWindowClosed.connect(app.quit)`
`142`	`144`	`cbook._setup_new_guiapp()`
`143`	`145`
`144`		`-try:`
`145`		`-app.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)# Only for Qt<6.`
`146`		`-exceptAttributeError:`
`147`		`-pass`
	`146`	`+ifqt_version==5:`
	`147`	`+app.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)`
`148`	`148`
`149`	`149`	`returnapp`
`150`	`150`

Comments

(0)