mirror of
https://github.com/qgis/QGIS.git
synced 2025-07-04 00:02:42 -04:00
Compare commits
No commits in common. "c512d8984d44b238130ec30c1f1dda263bd09907" and "fe299930cd60e668fda5142b9de9c6ee06ccf1b8" have entirely different histories.
c512d8984d
...
fe299930cd
2
.github/workflows/build-macos-qt6.yml
vendored
2
.github/workflows/build-macos-qt6.yml
vendored
@ -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@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # latest
|
uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # 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
|
||||||
|
2
.github/workflows/windows-qt6.yml
vendored
2
.github/workflows/windows-qt6.yml
vendored
@ -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@6b3e96a9bc9976b8b546346fdd102effedae0ca8
|
uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5
|
||||||
with:
|
with:
|
||||||
cmakeVersion: 3.31.6
|
cmakeVersion: 3.31.6
|
||||||
|
|
||||||
|
@ -658,9 +658,6 @@ 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"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user