Update to qt6

.pylintrc

@@ -11,8 +11,8 @@ ignore=tests,
     ui_newfwruledlg.py,
     ui_restoredlg.py,
     ui_settingsdlg.py,
-    resources_rc.py
-extension-pkg-whitelist=PyQt5
+    resources.py
+extension-pkg-whitelist=PyQt6
 
 [MESSAGES CONTROL]
 disable=

.qubesbuilder

@@ -9,3 +9,6 @@ vm:
   deb:
     build:
     - debian
+vm-jammy:
+  deb:
+    build: []

Makefile

@@ -2,26 +2,28 @@ VERSION := $(shell cat version)
 
 PYTHON ?= python3
 
-LRELEASE_QT5 ?= $(if $(wildcard /etc/debian_version),lrelease,lrelease-qt5)
+LRELEASE_QT6 ?= $(if $(wildcard /etc/debian_version),/usr/lib/qt6/bin/lrelease,lrelease-qt6)
+RCC ?= $(if $(wildcard /etc/debian_version),/usr/lib/qt6/libexec/rcc,/usr/lib64/qt6/libexec/rcc)
 
 SETUPTOOLS_OPTS =
 SETUPTOOLS_OPTS += $(if $(wildcard /etc/debian_version),--install-layout=deb,)
 
 export QT_HASH_SEED=0
 export PYTHONHASHSEED=0
+export QT_SELECT=qt6
 
 qubesmanager/ui_%.py: ui/%.ui
-	pyuic5 --from-imports -o $@ $<
+	pyuic6 -o $@ $<
 	touch --reference=$< $@
 
 ui: $(patsubst ui/%.ui,qubesmanager/ui_%.py,$(wildcard ui/*.ui))
 
 res:
-	pyrcc5 -o qubesmanager/resources_rc.py resources.qrc
-	touch --reference=resources.qrc qubesmanager/resources_rc.py
+	$(RCC) -g python resources.qrc | sed '0,/PySide6/s//PyQt6/' > qubesmanager/resources.py
+	touch --reference=resources.qrc qubesmanager/resources.py
 
 translations:
-	$(LRELEASE_QT5) qubesmanager.pro
+	$(LRELEASE_QT6) qubesmanager.pro
 
 python:
 	$(PYTHON) ./setup.py build
@@ -30,7 +32,7 @@ python_install:
 	$(PYTHON) ./setup.py install -O1 --skip-build --root $(DESTDIR) $(SETUPTOOLS_OPTS)
 
 update_ts: res
-	pylupdate5 qubesmanager.pro
+	pylupdate6 qubesmanager.pro
 
 install:
 	mkdir -p $(DESTDIR)/usr/libexec/qubes-manager/

debian/control

@@ -7,9 +7,12 @@ Build-Depends:
   dh-python,
   python3-all,
   python3-setuptools,
-  qtbase5-dev,
-  qttools5-dev-tools,
-  pyqt5-dev-tools
+  qt6-base-dev,
+  qt6-base-dev-tools,
+  qt6-tools-dev-tools,
+  qt6-l10n-tools,
+  pyqt6-dev,
+  pyqt6-dev-tools,
 Standards-Version: 4.3.0
 Homepage: https://www.qubes-os.org/
 #Vcs-Git: git://github.com/QubesOS/qubes-manager.git
@@ -20,7 +23,7 @@ Package: qubes-manager
 Architecture: any
 Depends:
   python3-qubesadmin (>= 4.3.0),
-  python3-pyqt5,
+  python3-pyqt6,
   python3-pyinotify,
   python3-qasync,
   qubes-desktop-linux-common,

debian/install

@@ -34,7 +34,7 @@
 /usr/lib/*/dist-packages/qubesmanager/qvm_template_gui.py
 /usr/lib/*/dist-packages/qubesmanager/clone_vm.py
 
-/usr/lib/*/dist-packages/qubesmanager/resources_rc.py
+/usr/lib/*/dist-packages/qubesmanager/resources.py
 
 /usr/lib/*/dist-packages/qubesmanager/ui_backupdlg.py
 /usr/lib/*/dist-packages/qubesmanager/ui_bootfromdevice.py

debian/rules

@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/default.mk
 export DESTDIR=$(shell pwd)/debian/tmp
-export QT_SELECT=qt5
+export QT_SELECT=qt6
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild

qubesmanager.pro

@@ -26,7 +26,7 @@ SOURCES = \
           qubesmanager/log_dialog.py \
           qubesmanager/multiselectwidget.py \
           qubesmanager/qube_manager.py \
-          qubesmanager/resources_rc.py \
+          qubesmanager/resources.py \
           qubesmanager/restore.py \
           qubesmanager/settings.py \
           qubesmanager/template_manager.py \

qubesmanager/.gitignore

@@ -1,4 +1,4 @@
 qrc_resources.py
-resources_rc.py
+resources.py
 ui_*.py
 *.py[co]

qubesmanager/about.py

@@ -20,12 +20,16 @@
 # with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 #
-from PyQt5.QtWidgets import QDialog  # pylint: disable=import-error
-from PyQt5.QtGui import QIcon  # pylint: disable=import-error
+from PyQt6.QtWidgets import QDialog  # pylint: disable=import-error
+from PyQt6.QtGui import QIcon  # pylint: disable=import-error
 from qubesmanager.informationnotes import InformationNotesDialog
 
 from . import ui_about  # pylint: disable=no-name-in-module
 
+# this is needed for icons to actually work
+# pylint: disable=unused-import, no-name-in-module
+from . import resources
+
 
 # pylint: disable=too-few-public-methods
 class AboutDialog(ui_about.Ui_AboutDialog, QDialog):
@@ -58,4 +62,4 @@ def __init__(self, parent=None):
 
     def on_information_notes_clicked(self):
         information_notes_dialog = InformationNotesDialog(self)
-        information_notes_dialog.exec_()
+        information_notes_dialog.exec()

qubesmanager/appmenu_select.py

@@ -20,7 +20,7 @@
 #
 
 import subprocess
-from PyQt5 import QtWidgets, QtCore  # pylint: disable=import-error
+from PyQt6 import QtWidgets, QtCore  # pylint: disable=import-error
 from qubesadmin import exc
 
 # TODO description in tooltip