summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-07-20 17:27:09 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-07-25 14:53:23 +0200
commitea9ac78788a7fac07742b5de96db21ae545ef716 (patch)
tree960e6041b1adb8f4f7e788f50f03623b94d53b0e
parent2c8c5dca44aba5612cc67b04dd3c7e5fc4919b19 (diff)
downloadqtlocation-ea9ac78788a7fac07742b5de96db21ae545ef716.tar.gz
Declare dependencies explicitly towards the consistent 6.2 set
The lts-6.2 branch confuses the Coin resolver, so explicitly make that branch get its dependencies from the consistent qt5.git super module. Change-Id: Ifd702e39378f433f62163356ecefa45e52146a11 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--dependencies.yaml19
1 files changed, 9 insertions, 10 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index bfeb577c..39d0b3c3 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,9 @@
-dependencies:
- ../qtbase:
- ref: 2ab88d9ffbe271e717ffcf877fa1d72b23469a52
- required: true
- ../qtpositioning:
- ref: a403d3302bae2db926ad53e065e2819679d01661
- required: true
- ../qtdeclarative:
- ref: c18e2fdc817e1cdb8e39675b8fca3f45e21b0577
- required: false
+product_dependency:
+ ../../qt/qt5:
+ ref: "6.2"
+dependency_source: supermodule
+dependencies: [
+ "../../qt/qtbase",
+ "../../qt/qtdeclarative",
+ "../../qt/qtpositioning"
+ ] \ No newline at end of file