Skip to content

build: Qt 6.11.0 support #1576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nelson-numerical-software merged 1 commit into from
Apr 17, 2026
Merged

build: Qt 6.11.0 support #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ARM64-environment.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%" (
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions modules/qml_engine/src/cpp/QtConstants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tools/install_dependencies/install-windows-64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions tools/install_dependencies/install-windows-arm64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion win64-environment.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%" (
Expand Down