From 08d8b0b501ca01b8bb160c7f8a5456f7b9755b32 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Tue, 11 Apr 2023 13:52:05 +0200 Subject: [PATCH] [qt] Update to Qt 6.5.0 (#996) --- .github/workflows/qt-ci.yml | 16 ++++++++-------- platform/qt/CHANGELOG.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml index 189b7ac06..54773bacd 100644 --- a/.github/workflows/qt-ci.yml +++ b/.github/workflows/qt-ci.yml @@ -64,7 +64,7 @@ jobs: - name: Linux os: ubuntu-22.04 build_type: RelWithDebInfo - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop - name: macOS os: macos-12 @@ -76,9 +76,9 @@ jobs: - name: macOS os: macos-12 build_type: RelWithDebInfo - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop - deployment_target: 10.14 + deployment_target: 11.0 deployment_arch: "x86_64;arm64" - name: win64_msvc2019 os: windows-2022 @@ -94,7 +94,7 @@ jobs: build_type: "RelWithDebInfo;Debug" compiler_type: x64 compiler_version: 14.29 - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop qt_arch: win64_msvc2019_64 qt_tools: '' @@ -112,7 +112,7 @@ jobs: build_type: RelWithDebInfo compiler_type: mingw1120_64 compiler_version: 11.2.0 - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop qt_arch: win64_mingw qt_tools: tools_mingw90 @@ -247,11 +247,11 @@ jobs: include: - name: Linux os: ubuntu-22.04 - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop - name: macOS os: macos-12 - qt_version: 6.4.2 + qt_version: 6.5.0 qt_target: desktop runs-on: ${{ matrix.os }} env: @@ -303,7 +303,7 @@ jobs: max-parallel: 1 matrix: name: [Linux, macOS, win64_msvc2019, win64_mingw] - qt_version: [5.15.2, 6.4.2] + qt_version: [5.15.2, 6.5.0] permissions: contents: write diff --git a/platform/qt/CHANGELOG.md b/platform/qt/CHANGELOG.md index 3988c6636..68b05c973 100644 --- a/platform/qt/CHANGELOG.md +++ b/platform/qt/CHANGELOG.md @@ -5,7 +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.2 +- Based on Qt 6.5.0 ### 🐞 Bug fixes