From ca667d642987a846e54b808362729a1f0b8aef07 Mon Sep 17 00:00:00 2001
From: toofar <toofar@spalge.com>
Date: Sun, 20 Nov 2022 16:15:06 +1300
Subject: Fixup dockerfile template for qt6 configurations

The merge resolution I did in 2d6646619449 was a bit hasty. Hopefully
all supported configurations should work now.
---
 scripts/dev/ci/docker/Dockerfile.j2 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2
index 90804d08e..cc66f37d7 100644
--- a/scripts/dev/ci/docker/Dockerfile.j2
+++ b/scripts/dev/ci/docker/Dockerfile.j2
@@ -10,13 +10,16 @@ RUN pacman -Suyy --noconfirm \
     {% if qt6 %}
     qt6-base \
     qt6-declarative \
-    {% if webengine %}qt6-webengine python-pyqt6-webengine{% else %}{{ 1/0 }}{% endif %} \
+    {% if webengine %}
+    qt6-webengine python-pyqt6-webengine \
+    {% else %}{{ 1/0 }}{% endif %}
     python-pyqt6 \
     {% else %}
     qt5-base \
     qt5-declarative \
     {% if webengine %}
     qt5-webengine python-pyqtwebengine \
+    {% endif %}
     python-pyqt5 \
     {% endif %}
     xorg-xinit \
@@ -32,10 +35,15 @@ RUN pacman -U --noconfirm \
     https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst
 {% endif %}
 
+{% if qt6 %}
+  {% set pyqt_module = 'PyQt6' %}
+{% else %}
+  {% set pyqt_module = 'PyQt5' %}
+{% endif %}
 {% if webengine %}
-RUN python3 -c "from PyQt5 import QtWebEngineCore, QtWebEngineWidgets"
+  RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets"
 {% else %}
-RUN python3 -c "from PyQt5 import QtWebKit, QtWebKitWidgets"
+  RUN python3 -c "from {{ pyqt_module }} import QtWebKit, QtWebKitWidgets"
 {% endif %}
 
 RUN useradd user -u 1001 && \
-- 
cgit v1.2.3-54-g00ecf