From 5aa3dc6350052f89f4fc268d4bf194b7f5c2a17f Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communication.com>
Date: Wed, 25 Feb 2026 15:44:27 +0100
Subject: [PATCH] Updated Qt version to 6.10.2

---
 .gitlab-ci-files/macosx-desktop.yml  | 10 +++++-----
 .gitlab-ci.yml                       |  2 +-
 docker-files/bc-dev-ubuntu-22-04-lts | 13 +++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index cc9d4f7d2..183c18acb 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -26,7 +26,7 @@
 
 .macosx-desktop:
   stage: build
-  tags: [ "macos-min-xcode12.2" ]
+  tags: [ "macos-min-xcode15" ]
   before_script:
     - QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER}
   rules:
@@ -95,7 +95,7 @@ macosx-ninja-novideo:
 # WAIT for QT6 for arm64
 macosx-ninja-package:
   stage: package
-  tags: [ "macosx-min-xcode12.2" ]
+  tags: [ "macos-min-xcode15" ]
   needs: []
   rules:
     - !reference [.rules-merge-request-manual, rules]
@@ -119,7 +119,7 @@ macosx-ninja-package:
 
 macosx-codesigning:
   stage: signing
-  tags: [ "macosx-min-xcode12.2" ]
+  tags: [ "macos-min-xcode15" ]
   needs:
     - macosx-ninja-package
   rules:
@@ -144,7 +144,7 @@ macosx-codesigning:
 
 macosx-deploy:
  stage: deploy
- tags: [ "macosx-min-xcode12.2" ]
+ tags: [ "macos-min-xcode15" ]
  needs:
    - macosx-codesigning
  only:
@@ -162,7 +162,7 @@ macosx-deploy:
 
 macosx-makefile-plugins-deploy:
  stage: deploy
- tags: [ "macosx-min-xcode12.2" ]
+ tags: [ "macos-min-xcode15" ]
  needs:
    - macosx-makefile
  only:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2deb7d311..63c714bf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   #CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
 
 # Docker image version
-  UBUNTU_2204_IMAGE_VERSION: 20260209_add_qt_6.8.3_opensource
+  UBUNTU_2204_IMAGE_VERSION: 20260225_add_qt_6.10.2
 
 
 workflow:
diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts
index 15cec8a8a..fbc7303e6 100644
--- a/docker-files/bc-dev-ubuntu-22-04-lts
+++ b/docker-files/bc-dev-ubuntu-22-04-lts
@@ -93,6 +93,8 @@ RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource
 RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
 RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource
 RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
+RUN sudo python3 -m aqt install-qt linux desktop 6.10.2 -O /opt/Qt/opensource
+RUN sudo python3 -m aqt install-qt linux desktop 6.10.2 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
 
 RUN sudo chown -R bc:bc /opt/Qt/
 
@@ -100,6 +102,7 @@ RUN qtchooser -install "5.15.2-opensource" /opt/Qt/opensource/5.15.2/gcc_64/bin/
 RUN qtchooser -install "6.8.3-opensource" /opt/Qt/opensource/6.8.3/gcc_64/bin/qmake
 RUN qtchooser -install "6.9.1-opensource" /opt/Qt/opensource/6.9.1/gcc_64/bin/qmake
 RUN qtchooser -install "6.10.0-opensource" /opt/Qt/opensource/6.10.0/gcc_64/bin/qmake
+RUN qtchooser -install "6.10.2-opensource" /opt/Qt/opensource/6.10.2/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
@@ -170,12 +173,22 @@ 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.6100.linux_gcc_64 qt.qt6.6100.addons.qtnetworkauth qt.qt6.6100.addons.qtquick3d qt.qt6.6100.addons.qt5compat qt.qt6.6100.addons.qtshadertools
 
+# # Install Qt 6.10.2 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.6102.linux_gcc_64 qt.qt6.6102.addons.qtnetworkauth qt.qt6.6102.addons.qtquick3d qt.qt6.6102.addons.qt5compat qt.qt6.6102.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
 RUN qtchooser -install 6.10.0-proprietary /opt/Qt/proprietary/6.10.0/gcc_64/bin/qmake
+RUN qtchooser -install 6.10.2-proprietary /opt/Qt/proprietary/6.10.2/gcc_64/bin/qmake
 
 RUN rm -f /home/bc/.local/share/Qt/qtaccount.ini
 RUN rm -f /home/bc/.local/share/Qt/qtlicenses.ini