diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2023-11-24 10:04:31 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-11-24 13:46:04 +0000 |
commit | 98521742cf1ba8d30587b317ddd8bda0d3216547 (patch) | |
tree | d1630d50f64ff828539d586286ce20885d31feae | |
parent | 7867c6aaa375e6c7ff3affb67dc6af56df1ecdf4 (diff) |
Docker: Update Qt version in Windows image
With Qt 6.5, qhelpgenerator crashes when building the documentation,
which prevents us from building release packages.
Change-Id: I51b30ef6a6bf18d9032aa27ac6afae5edf558c18
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r-- | .github/actions/download-qt/action.yml | 2 | ||||
-rw-r--r-- | docker-compose.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/actions/download-qt/action.yml b/.github/actions/download-qt/action.yml index ff1d31d60..039f29ca6 100644 --- a/.github/actions/download-qt/action.yml +++ b/.github/actions/download-qt/action.yml @@ -4,7 +4,7 @@ inputs: version: description: 'Qt version' required: false - default: '6.5.0' + default: '6.6.0' target: description: 'Qt target (desktop, ios, android)' required: false diff --git a/docker-compose.yml b/docker-compose.yml index cc0391faf..ffcaf6eee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,12 +167,12 @@ services: QTCREATOR_VERSION: 5.0.3 windows: - image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.5.0_1.24.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.6.0_1.24.0-0 build: dockerfile: docker/windowsservercore/Dockerfile context: . args: - QT_VERSION: 6.5.0 + QT_VERSION: 6.6.0 QTCREATOR_VERSION: 9.0.1 working_dir: 'C:/qbs' environment: |