From 6806c1c58a354fa78c15443f6edbf0dcd8906ff2 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sat, 30 Apr 2022 08:42:03 +1000 Subject: [PATCH 1/2] Fix deprecation warnings --- src/core/qgsowsconnection.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/qgsowsconnection.cpp b/src/core/qgsowsconnection.cpp index 5ba50e12a516..4dd02fc3e616 100644 --- a/src/core/qgsowsconnection.cpp +++ b/src/core/qgsowsconnection.cpp @@ -102,7 +102,9 @@ QgsDataSourceUri QgsOwsConnection::uri() const QgsDataSourceUri &QgsOwsConnection::addWmsWcsConnectionSettings( QgsDataSourceUri &uri, const QString &settingsKey ) { + Q_NOWARN_DEPRECATED_PUSH addCommonConnectionSettings( uri, settingsKey ); + Q_NOWARN_DEPRECATED_POP const QgsSettings settings; const QString referer = settings.value( settingsKey + "/referer" ).toString(); @@ -170,7 +172,9 @@ QgsDataSourceUri &QgsOwsConnection::addWmsWcsConnectionSettings( QgsDataSourceUr QgsDataSourceUri &QgsOwsConnection::addWfsConnectionSettings( QgsDataSourceUri &uri, const QString &settingsKey ) { + Q_NOWARN_DEPRECATED_PUSH addCommonConnectionSettings( uri, settingsKey ); + Q_NOWARN_DEPRECATED_POP const QgsSettings settings; const QString version = settings.value( settingsKey + "/version" ).toString(); From 9b4bb592ccbbfd00808b094c22b277751f47083e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 07:57:27 +0000 Subject: [PATCH 2/2] Bump actions/cache from 3.0.1 to 3.2.6 Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.2.6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.2.6) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-docker.yml | 2 +- .github/workflows/macos-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 526e5cb974e4..27535343f3ad 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -64,7 +64,7 @@ jobs: - name: Cache id: cache - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.2.6 with: path: ~/.ccache key: docker-build-${{ matrix.branch }}-${{ github.sha }} diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 491f490de0d8..0055e2e6f18c 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -58,7 +58,7 @@ jobs: # Qt caching - name: Cache Qt id: cache-qt - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.2.6 with: path: ${{ env.DEPS_CACHE_DIR }}/Qt/${{ env.QT_VERSION }} key: mac-qt-${{ env.QT_VERSION }} @@ -81,7 +81,7 @@ jobs: # QGIS-deps caching - name: Cache qgis-deps id: cache-deps - uses: actions/cache@v3.0.1 + uses: actions/cache@v3.2.6 with: path: ${{ env.DEPS_CACHE_DIR }}/QGIS/qgis-deps-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }} key: mac-qgis-deps-${{ env.QGIS_DEPS_VERSION }}.${{ env.QGIS_DEPS_PATCH_VERSION }}