From 38dd987b0846fd944bb253e673cad33a2c658e98 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sat, 19 Nov 2022 09:39:16 +0100 Subject: [PATCH] Update automated builds to use Qt 6.4.1 (#559) --- .github/workflows/qt-ci.yml | 14 +++++++------- platform/qt/CHANGELOG.md | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml index 6ab1b9f07..d957d9209 100644 --- a/.github/workflows/qt-ci.yml +++ b/.github/workflows/qt-ci.yml @@ -61,7 +61,7 @@ jobs: - name: Linux os: ubuntu-22.04 build_type: RelWithDebInfo - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop - name: macOS os: macos-12 @@ -73,7 +73,7 @@ jobs: - name: macOS os: macos-12 build_type: RelWithDebInfo - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop deployment_target: 10.14 deployment_arch: "x86_64;arm64" @@ -91,7 +91,7 @@ jobs: build_type: "RelWithDebInfo;Debug" compiler_type: x64 compiler_version: 14.29 - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop qt_arch: win64_msvc2019_64 qt_tools: '' @@ -109,7 +109,7 @@ jobs: build_type: RelWithDebInfo compiler_type: mingw1120_64 compiler_version: 11.2.0 - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop qt_arch: win64_mingw qt_tools: tools_mingw90 @@ -243,11 +243,11 @@ jobs: include: - name: Linux os: ubuntu-22.04 - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop - name: macOS os: macos-12 - qt_version: 6.4.0 + qt_version: 6.4.1 qt_target: desktop runs-on: ${{ matrix.os }} env: @@ -299,7 +299,7 @@ jobs: max-parallel: 1 matrix: name: [Linux, macOS, win64_msvc2019, win64_mingw] - qt_version: [5.15.2, 6.4.0] + qt_version: [5.15.2, 6.4.1] permissions: contents: write diff --git a/platform/qt/CHANGELOG.md b/platform/qt/CHANGELOG.md index 110b2225a..7459125f5 100644 --- a/platform/qt/CHANGELOG.md +++ b/platform/qt/CHANGELOG.md @@ -5,6 +5,7 @@ ### ✨ New features - Support for GeoJSON feature collections using std::list ([#541](https://github.com/maplibre/maplibre-gl-native/pull/541)). +- Based on Qt 6.4.1 ### 🐞 Bug fixes