From bb0249aa6975db7338c238594e0216ce699f0a48 Mon Sep 17 00:00:00 2001
From: Allan CORNET <nelson.numerical.computation@gmail.com>
Date: Thu, 16 Apr 2026 17:34:02 +0200
Subject: [PATCH] build: Qt 6.11.0 support

---
 ARM64-environment.bat                                | 2 +-
 CHANGELOG.md                                         | 2 ++
 modules/qml_engine/src/cpp/QtConstants.cpp           | 2 ++
 tools/install_dependencies/install-windows-64.bat    | 4 ++--
 tools/install_dependencies/install-windows-arm64.bat | 4 ++--
 win64-environment.bat                                | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ARM64-environment.bat b/ARM64-environment.bat
index 22b72ed77c..bd5f481834 100644
--- a/ARM64-environment.bat
+++ b/ARM64-environment.bat
@@ -17,7 +17,7 @@ rem Remove trailing backslash if present
 set BAT_PATH=%BAT_PATH:~0,-1%
 rem =============================================================================
 if not defined QTDIR64 (
-  for %%i in ("%BAT_PATH%\..\qt_woa64\6.10.1\msvc2022_arm64") do set QTDIR64=%%~fi
+  for %%i in ("%BAT_PATH%\..\qt_woa64\6.11.0\msvc2022_arm64") do set QTDIR64=%%~fi
 )
 rem =============================================================================
 if not exist "%QTDIR64%" (
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dcb3c3414..dc9a570bdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - MacOS packaging as dmg installer.
 
+- Qt 6.11.0 support.
+
 ### Changed
 
 - Reduced interpreter overhead in tight loops.
diff --git a/modules/qml_engine/src/cpp/QtConstants.cpp b/modules/qml_engine/src/cpp/QtConstants.cpp
index 1b44d0a078..44fcbb802d 100644
--- a/modules/qml_engine/src/cpp/QtConstants.cpp
+++ b/modules/qml_engine/src/cpp/QtConstants.cpp
@@ -152,7 +152,9 @@ initializeQtConstantsMap()
     mapConstants[L"Qt.Tool"] = Qt::Tool;
     mapConstants[L"Qt.ToolTip"] = Qt::ToolTip;
     mapConstants[L"Qt.SplashScreen"] = Qt::SplashScreen;
+#if QT_VERSION < QT_VERSION_CHECK(6, 11, 0)
     mapConstants[L"Qt.Desktop"] = Qt::Desktop;
+#endif
     mapConstants[L"Qt.SubWindow"] = Qt::SubWindow;
     mapConstants[L"Qt.ForeignWindow"] = Qt::ForeignWindow;
     mapConstants[L"Qt.CoverWindow"] = Qt::CoverWindow;
diff --git a/tools/install_dependencies/install-windows-64.bat b/tools/install_dependencies/install-windows-64.bat
index ef4e02f5c3..bc07fdc3fd 100644
--- a/tools/install_dependencies/install-windows-64.bat
+++ b/tools/install_dependencies/install-windows-64.bat
@@ -81,9 +81,9 @@ if exist "%BAT_PATH%\..\..\..\qt_windows_x64\" (
 )
 rem =============================================================================
 rem Resolve QTDIR64 to absolute path by temporarily changing directory
-pushd "%BAT_PATH%\..\..\..\qt_windows_x64\6.10.0\msvc2022_64" 2>nul
+pushd "%BAT_PATH%\..\..\..\qt_windows_x64\6.11.0\msvc2022_64" 2>nul
 if errorlevel 1 (
-    echo ERROR: Qt directory does not exist: "%BAT_PATH%\..\..\..\qt_windows_x64\6.10.0\msvc2022_64"
+    echo ERROR: Qt directory does not exist: "%BAT_PATH%\..\..\..\qt_windows_x64\6.11.0\msvc2022_64"
     cd "%ORIGINAL_DIR%"
     exit /b 1
 )
diff --git a/tools/install_dependencies/install-windows-arm64.bat b/tools/install_dependencies/install-windows-arm64.bat
index 453e2fe717..397e047bb4 100644
--- a/tools/install_dependencies/install-windows-arm64.bat
+++ b/tools/install_dependencies/install-windows-arm64.bat
@@ -81,9 +81,9 @@ if exist "%BAT_PATH%\..\..\..\qt_woa64\" (
 )
 rem =============================================================================
 rem Resolve QTDIR64 to absolute path by temporarily changing directory
-pushd "%BAT_PATH%\..\..\..\qt_woa64\6.10.1\msvc2022_arm64" 2>nul
+pushd "%BAT_PATH%\..\..\..\qt_woa64\6.11.0\msvc2022_arm64" 2>nul
 if errorlevel 1 (
-    echo ERROR: Qt directory does not exist: "%BAT_PATH%\..\..\..\qt_woa64\6.10.1\msvc2022_arm64"
+    echo ERROR: Qt directory does not exist: "%BAT_PATH%\..\..\..\qt_woa64\6.11.0\msvc2022_arm64"
     cd "%ORIGINAL_DIR%"
     exit /b 1
 )
diff --git a/win64-environment.bat b/win64-environment.bat
index 2e69f126fd..deccee4164 100644
--- a/win64-environment.bat
+++ b/win64-environment.bat
@@ -17,7 +17,7 @@ rem Remove trailing backslash if present
 set BAT_PATH=%BAT_PATH:~0,-1%
 rem =============================================================================
 if not defined QTDIR64 (
-  for %%i in ("%BAT_PATH%\..\qt_windows_x64\6.10.0\msvc2022_64") do set QTDIR64=%%~fi
+  for %%i in ("%BAT_PATH%\..\qt_windows_x64\6.11.0\msvc2022_64") do set QTDIR64=%%~fi
 )
 rem =============================================================================
 if not exist "%QTDIR64%" (