Merge pull request #2382 from willend/main

willend · web-flow · commit 683bf7d57fb2 · 2026-03-31T06:49:14.000+02:00
Repair Qt message box - we should now be on PyQt6 everywhere
diff --git a/cmake/support/run-scripts/mccode_errmsg.bat.in b/cmake/support/run-scripts/mccode_errmsg.bat.in
@@ -3,4 +3,4 @@
 
 @set ERRMSG="@FLAVOR@: %*"
 
-@python -c "import os;import PyQt5.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
+@python -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
diff --git a/cmake/support/run-scripts/mccode_errmsg.in b/cmake/support/run-scripts/mccode_errmsg.in
@@ -10,4 +10,4 @@ export PATH=$PREFIX/@DEST_BINDIR@:$PATH
 ERRMSG=`echo $* | sed s/\ /\\ /g`
 export ERRMSG="@FLAVOR@: $ERRMSG"
 
-python3 -c "import os;import PyQt5.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
+python3 -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`
`4`	`4`	`@set ERRMSG="@FLAVOR@: %*"`
`5`	`5`
`6`		`-@python -c "import os;import PyQt5.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"`
	`6`	`+@python -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"`