From 11c586792dc36f3c877f767a00c8097b35da87ec Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communication.com>
Date: Tue, 30 Sep 2025 11:53:35 +0200
Subject: [PATCH] Allow switch between QT proprietary and opensource for same
 version. Updated docker image and CI scripts

---
 .gitlab-ci.yml                       |  2 +-
 docker-files/bc-dev-ubuntu-22-04-lts | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 214f20b5d..e30b907d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
   #CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
 
 # Docker image version
-  UBUNTU_2204_IMAGE_VERSION: 20250924_add_commercial_qt_versions_5.15.14_5.15.19_6.8.1_6.8.3
+  UBUNTU_2204_IMAGE_VERSION: 20250930_add_commercial_qt_versions_5.15.14_5.15.19_6.8.1_6.8.3_6.9.1
 
 
 workflow:
diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts
index 88d9bf659..64e138b51 100644
--- a/docker-files/bc-dev-ubuntu-22-04-lts
+++ b/docker-files/bc-dev-ubuntu-22-04-lts
@@ -95,8 +95,8 @@ RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt/opensou
 
 RUN sudo chown -R bc:bc /opt/Qt/
 
-RUN qtchooser -install $QT_VERSION /opt/Qt/opensource/$QT_VERSION/gcc_64/bin/qmake
-RUN qtchooser -install $QT6_VERSION /opt/Qt/opensource/$QT6_VERSION/gcc_64/bin/qmake
+RUN qtchooser -install "$QT_VERSION-opensource" /opt/Qt/opensource/$QT_VERSION/gcc_64/bin/qmake
+RUN qtchooser -install "$QT6_VERSION-opensource" /opt/Qt/opensource/$QT6_VERSION/gcc_64/bin/qmake
 
 # Download QT official installer for proprietary versions
 # -O : name the destination file after the remote file name, in the current directory
@@ -149,9 +149,19 @@ RUN /opt/Qt/proprietary/MaintenanceTool \
   --auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
   install qt.qt6.683.linux_gcc_64 qt.qt6.683.addons.qtnetworkauth qt.qt6.683.addons.qtquick3d qt.qt6.683.addons.qtmultimedia qt.qt6.683.addons.qt5compat qt.qt6.683.addons.qtshadertools
 
-RUN qtchooser -install 5.15.19 /opt/Qt/proprietary/5.15.19/gcc_64/bin/qmake
-RUN qtchooser -install 5.15.14 /opt/Qt/proprietary/5.15.14/gcc_64/bin/qmake
-RUN qtchooser -install 6.8.1 /opt/Qt/proprietary/6.8.1/gcc_64/bin/qmake
-RUN qtchooser -install 6.8.3 /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake
+# # Install Qt 6.9.1 proprietary
+RUN /opt/Qt/proprietary/MaintenanceTool \
+  --accept-licenses \
+  --accept-obligations \
+  --confirm-command \
+  --root "/opt/Qt/proprietary" \
+  --auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
+  install qt.qt6.691.linux_gcc_64 qt.qt6.691.addons.qtnetworkauth qt.qt6.691.addons.qtquick3d qt.qt6.691.addons.qtmultimedia qt.qt6.691.addons.qt5compat qt.qt6.691.addons.qtshadertools
+
+RUN qtchooser -install 5.15.19-proprietary /opt/Qt/proprietary/5.15.19/gcc_64/bin/qmake
+RUN qtchooser -install 5.15.14-proprietary /opt/Qt/proprietary/5.15.14/gcc_64/bin/qmake
+RUN qtchooser -install 6.8.1-proprietary /opt/Qt/proprietary/6.8.1/gcc_64/bin/qmake
+RUN qtchooser -install 6.8.3-proprietary /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake
+RUN qtchooser -install 6.9.1-proprietary /opt/Qt/proprietary/6.9.1/gcc_64/bin/qmake
 
 cmd bash
\ No newline at end of file