Compare commits

...

4 Commits

Author SHA1 Message Date
Matthias Kuhn
c512d8984d
Merge pull request #62486 from qgis/dependabot/github_actions/lukka/get-cmake-4.0.3
Bump lukka/get-cmake from 4.0.2 to 4.0.3
2025-07-03 05:59:23 +02:00
Loïc Bartoletti
b927df884f
Merge pull request #62484 from jef-n/fix-62478
fix #62478 (followup eac401c009)
2025-07-02 06:09:23 +02:00
dependabot[bot]
855e741ada
Bump lukka/get-cmake from 4.0.2 to 4.0.3
Bumps [lukka/get-cmake](https://github.com/lukka/get-cmake) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/lukka/get-cmake/releases)
- [Commits](ea00481682...6b3e96a9bc)

---
updated-dependencies:
- dependency-name: lukka/get-cmake
  dependency-version: 4.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-01 19:05:49 +00:00
Juergen E. Fischer
6fd32d92fd fix #62478 (followup eac401c009) 2025-07-01 17:54:58 +02:00
3 changed files with 5 additions and 2 deletions

View File

@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: 🐩 Install CMake and Ninja - name: 🐩 Install CMake and Ninja
uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # latest uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # latest
with: with:
# Pin to specific version to avoid rebuilding too often # Pin to specific version to avoid rebuilding too often
# Also helps to avoid spurious build failures like https://github.com/qgis/QGIS/pull/47098 # Also helps to avoid spurious build failures like https://github.com/qgis/QGIS/pull/47098

View File

@ -33,7 +33,7 @@ jobs:
choco uninstall cmake.install choco uninstall cmake.install
- name: 🐩 Install CMake and Ninja - name: 🐩 Install CMake and Ninja
uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8
with: with:
cmakeVersion: 3.31.6 cmakeVersion: 3.31.6

View File

@ -658,6 +658,9 @@ class Repositories(QObject):
.text() .text()
.strip() .strip()
) )
supports_qt6 = pluginNodes.item(i).firstChildElement(
"supports_qt6"
).text().strip().upper() in ["TRUE", "YES"]
if not qgisMaximumVersion: if not qgisMaximumVersion:
if qgisMinimumVersion[0] == "3" and supports_qt6: if qgisMinimumVersion[0] == "3" and supports_qt6:
qgisMaximumVersion = "4.99" qgisMaximumVersion = "4.99"