diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 491f490de0d8..466afe5f05a1 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - name: Prepare build cache for pull request - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name == 'pull_request' with: path: ${{ env.CCACHE_DIR }} @@ -44,7 +44,7 @@ jobs: - name: Prepare build cache for branch/tag # use a fork of actions/cache@v2 to upload cache even when the build or test failed - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name != 'pull_request' with: path: ${{ env.CCACHE_DIR }} diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml index 05f075d85f55..65bc3f5237fb 100644 --- a/.github/workflows/mingw64.yml +++ b/.github/workflows/mingw64.yml @@ -51,7 +51,7 @@ jobs: run: mkdir -p /w/.ccache/QGIS - name: Prepare build cache for pull request - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name == 'pull_request' with: path: /w/.ccache/QGIS @@ -65,7 +65,7 @@ jobs: - name: Prepare build cache for branch/tag # use a fork of actions/cache@v2 to upload cache even when the build or test failed - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name != 'pull_request' with: path: /w/.ccache/QGIS diff --git a/.github/workflows/ogc.yml b/.github/workflows/ogc.yml index cd42fd39f81e..375d5a14a624 100644 --- a/.github/workflows/ogc.yml +++ b/.github/workflows/ogc.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v3 - name: Prepare build cache for pull request - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name == 'pull_request' with: path: /home/runner/QGIS/.ccache @@ -51,7 +51,7 @@ jobs: - name: Prepare build cache for branch/tag # use a fork of actions/cache@v2 to upload cache even when the build or test failed - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name != 'pull_request' with: path: /home/runner/QGIS/.ccache diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index dd08cb6e775a..8036a6229997 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -129,7 +129,7 @@ jobs: docker push "qgis/qgis3-build-deps:${DOCKER_TAG}" - name: Prepare build cache for pull request - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name == 'pull_request' with: path: /home/runner/QGIS/.ccache @@ -143,7 +143,7 @@ jobs: - name: Prepare build cache for branch/tag # use a fork of actions/cache@v2 to upload cache even when the build or test failed - uses: pat-s/always-upload-cache@v2.1.5 + uses: pat-s/always-upload-cache@v3.0.11 if: github.event_name != 'pull_request' with: path: /home/runner/QGIS/.ccache 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();