ci: Prepare Qt 6 dockerfiles

.github/workflows/ci.yml

@@ -86,6 +86,7 @@ jobs:
         image:
           - archlinux-webkit
           - archlinux-webengine
+          # - archlinux-webengine-qt6  # FIXME:qt6 activate
           # - archlinux-webengine-unstable
     container:
       image: "qutebrowser/ci:${{ matrix.image }}"

scripts/dev/ci/docker/Dockerfile.j2

@@ -7,10 +7,17 @@ RUN pacman -Suyy --noconfirm \
     git \
     python-tox \
     python-distlib \
+    {% if qt6 %}
+    qt6-base \
+    qt6-declarative \
+    {% if webengine %}qt6-webengine python-pyqt6-webengine{% else %}{{ 1/0 }}{% endif %} \
+    python-pyqt6 \
+    {% else %}
     qt5-base \
     qt5-declarative \
-    {% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \
+    {% if webengine %}qt5-webengine python-pyqt5-webengine{% else %}qt5-webkit{% endif %} \
     python-pyqt5 \
+    {% endif %}
     xorg-xinit \
     xorg-server-xvfb \
     ttf-bitstream-vera \

scripts/dev/ci/docker/generate.py

@@ -31,9 +31,10 @@ def main():
 
     image = sys.argv[1]
     config = {
-        'archlinux-webkit': {'webengine': False, 'unstable': False},
-        'archlinux-webengine': {'webengine': True, 'unstable': False},
-        'archlinux-webengine-unstable': {'webengine': True, 'unstable': True},
+        'archlinux-webkit': {'webengine': False, 'unstable': False, 'qt6': False},
+        'archlinux-webengine': {'webengine': True, 'unstable': False, 'qt6': False},
+        'archlinux-webengine-qt6': {'webengine': True, 'unstable': False, 'qt6': True},
+        'archlinux-webengine-unstable': {'webengine': True, 'unstable': True, 'qt6': False},
     }[image]
 
     with open('Dockerfile', 'w') as f: