From 4e0f938ec7973d94d4f925c57e30637386fcd50a Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communication.com>
Date: Wed, 17 Dec 2025 10:31:23 +0100
Subject: [PATCH] Force QT version in CI scripts

---
 .gitlab-ci-files/linux-prepare.yml   | 2 ++
 .gitlab-ci-files/macosx-desktop.yml  | 2 ++
 .gitlab-ci-files/windows-desktop.yml | 3 +++
 .gitlab-ci.yml                       | 6 +++---
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci-files/linux-prepare.yml b/.gitlab-ci-files/linux-prepare.yml
index 3b8d689f0..03cabb4d5 100644
--- a/.gitlab-ci-files/linux-prepare.yml
+++ b/.gitlab-ci-files/linux-prepare.yml
@@ -16,6 +16,8 @@
     - if ! [ -z ${TUNNEL_USER_KEY+x} ]; then mkdir -p ~/.ssh && chmod 700 ~/.ssh; fi
     - if ! [ -z ${TUNNEL_USER_KEY+x} ]; then echo -e "Host gitlab.linphone.org\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config; fi
 
+
+    - QT_LINUX_VER=${QT_LINUX_VER_FORCED:-$QT_LINUX_VER}
     ##
     ## Then configure ccache
     ##
diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index b2f5e8822..dd5b6c5f1 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -27,6 +27,8 @@
 .macosx-desktop:
   stage: build
   tags: [ "macos-min-xcode12.2" ]
+  before_script:
+    - QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER}
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
     - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml
index 37a444201..b01f61206 100644
--- a/.gitlab-ci-files/windows-desktop.yml
+++ b/.gitlab-ci-files/windows-desktop.yml
@@ -18,6 +18,9 @@
     CMAKE_CXX_COMPILER : cl.exe
     CMAKE_RC_COMPILER : rc.exe
 
+  before_script:
+    - If ( Test-Path env:QT_WIN_VER_FORCED ) { $env:Path = ("C:\Qt\$QT_SUBDIR\" + $env:QT_WIN_VER_FORCED + "\msvc2022_64\bin;" + $env:Path) }
+
   script:
     - if ($MAKE_RELEASE_FILE_URL) { } else { $RELEASE_FILE = "" }
     - echo $env:Path
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3b36a2d1..f6d578d24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,9 @@ variables:
   DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS
   DEFAULT_WINDOWS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS
   
-  QT_WIN_VER: 6.9.1
-  QT_MAC_VER: "6.9.1/macos"
-  QT_LINUX_VER: 6.9.1
+  QT_WIN_VER_FORCED: 6.9.1
+  QT_MAC_VER_FORCED: "6.9.1/macos"
+  QT_LINUX_VER_FORCED: 6.9.1
 
 #  DEFAULT_LINUX_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES
 #  DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES